Merge pull request #23 from makyo/groups

Groups
OpenFurry · Oct 28, 2016 · 6adf29f · 6adf29f
2 parents 13383b6 + ec3b3d8
commit 6adf29f
Show file tree

Hide file tree

Showing 26 changed files with 789 additions and 188 deletions.
diff --git a/coverage-badge.svg b/coverage-badge.svg
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/promotion/migrations/0001_initial.py b/promotion/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
 from django.conf import settings

diff --git a/...ion/migrations/0002_auto_20161024_0411.py → ...ion/migrations/0002_auto_20161028_0540.py b/...ion/migrations/0002_auto_20161024_0411.py → ...ion/migrations/0002_auto_20161028_0540.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
 from django.conf import settings

diff --git a/publishers/migrations/0001_initial.py b/publishers/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
 from django.conf import settings

diff --git a/social/migrations/0001_initial.py b/social/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
 from django.conf import settings

diff --git a/social/migrations/0002_auto_20161024_0411.py → social/migrations/0002_auto_20161028_0540.py b/social/migrations/0002_auto_20161024_0411.py → social/migrations/0002_auto_20161028_0540.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
 from django.conf import settings

diff --git a/submissions/migrations/0001_initial.py b/submissions/migrations/0001_initial.py
@@ -1,19 +1,15 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-10-24 04:11
+# Generated by Django 1.10.2 on 2016-10-28 05:40
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        ('auth', '0008_alter_user_username_max_length'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -23,16 +19,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=1000)),
                 ('slug', models.SlugField()),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='submissions.Folder')),
             ],
         ),
         migrations.CreateModel(
             name='FolderItem',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('position', models.PositiveIntegerField()),
-                ('folder', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submissions.Folder')),
             ],
             options={
                 'ordering': ['position'],
@@ -63,19 +56,6 @@ class Migration(migrations.Migration):
                 ('rating_stars', models.CharField(default='&#x2606;&#x2606;&#x2606;&#x2606;&#x2606;', max_length=40)),
                 ('rating_average', models.DecimalField(decimal_places=2, default=0.0, max_digits=3)),
                 ('rating_count', models.PositiveIntegerField(default=0)),
-                ('allowed_groups', models.ManyToManyField(blank=True, to='auth.Group')),
-                ('folders', models.ManyToManyField(blank=True, through='submissions.FolderItem', to='submissions.Folder')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
-        migrations.AddField(
-            model_name='folderitem',
-            name='submission',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submissions.Submission'),
-        ),
-        migrations.AddField(
-            model_name='folder',
-            name='submissions',
-            field=models.ManyToManyField(through='submissions.FolderItem', to='submissions.Submission'),
-        ),
     ]
diff --git a/submissions/migrations/0002_auto_20161028_0540.py b/submissions/migrations/0002_auto_20161028_0540.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-10-28 05:40
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('usermgmt', '0001_initial'),
+        ('submissions', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='allowed_groups',
+            field=models.ManyToManyField(blank=True, to='usermgmt.FriendGroup'),
+        ),
+        migrations.AddField(
+            model_name='submission',
+            name='folders',
+            field=models.ManyToManyField(blank=True, through='submissions.FolderItem', to='submissions.Folder'),
+        ),
+        migrations.AddField(
+            model_name='submission',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='folderitem',
+            name='folder',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submissions.Folder'),
+        ),
+        migrations.AddField(
+            model_name='folderitem',
+            name='submission',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submissions.Submission'),
+        ),
+        migrations.AddField(
+            model_name='folder',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='folder',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='submissions.Folder'),
+        ),
+        migrations.AddField(
+            model_name='folder',
+            name='submissions',
+            field=models.ManyToManyField(through='submissions.FolderItem', to='submissions.Submission'),
+        ),
+    ]
diff --git a/submissions/models.py b/submissions/models.py
@@ -1,15 +1,13 @@
 from __future__ import unicode_literals
 import markdown
 
-from django.contrib.auth.models import (
-    Group,
-    User,
-)
+from django.contrib.auth.models import User
 from django.db import models
 from django.template.defaultfilters import slugify
 from django.utils.html import strip_tags
 
 from honeycomb_markdown import HoneycombMarkdown
+from usermgmt.group_models import FriendGroup
 
 
 class Submission(models.Model):
@@ -42,7 +40,7 @@ class Submission(models.Model):
         default=False,
         verbose_name='submission for adults only')
     hidden = models.BooleanField(default=False)
-    allowed_groups = models.ManyToManyField(Group, blank=True)
+    allowed_groups = models.ManyToManyField(FriendGroup, blank=True)
 
     # Organization
     restricted_to_groups = models.BooleanField(
@@ -86,6 +84,14 @@ def get_average_rating(self):
         else:
             return {'stars': '', 'average': 0, 'count': 0}
 
+    def __str__(self):
+        return '{} by {} (id:{})'.format(self.title, self.owner.username,
+                                         self.id)
+
+    def __unicode__(self):
+        return '{} by {} (id:{})'.format(self.title, self.owner.username,
+                                         self.id)
+
 
 class Folder(models.Model):
     # Folder owner

diff --git a/submissions/templates/list_submissions.html b/submissions/templates/list_submissions.html
@@ -73,13 +73,13 @@ <h2>Folders</h2>
                 {% if folder %}
                     {% if folder.parent %}
                         <li class="list-group-item list-group-item-info">
-                            <a href="{% url 'submissions:view_folder' username=author.username folder_id=folder.parent.id folder_slug=folder.parent.slug %}">
+                            <a href="{% url 'submissions:view_folder' username=author.username folder_id=folder.parent.id folder_slug=folder.parent.slug %}"><span class="glyphicon glyphicon-menu-left"></span>
                                 <em>Parent folder: {{ folder.parent.name }}</em>
                             </a>
                         </li>
                     {% else %}
                         <li class="list-group-item list-group-item-info">
-                            <a href="{% url 'submissions:view_root_level_folders' username=author.username %}">
+                            <a href="{% url 'submissions:view_root_level_folders' username=author.username %}"><span class="glyphicon glyphicon-menu-left"></span>
                                 <em>Parent folder</em>
                             </a>
                         </li>