diff --git a/forum/migrations/0002_auto_20170128_1958.py b/forum/migrations/0002_auto_20170128_1958.py new file mode 100644 index 00000000..bfc0c90a --- /dev/null +++ b/forum/migrations/0002_auto_20170128_1958.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('forum', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='forum', + name='owner_group', + ), + migrations.RemoveField( + model_name='forumtopic', + name='title', + ), + ] diff --git a/forum/migrations/0003_forum_owner_club.py b/forum/migrations/0003_forum_owner_club.py new file mode 100644 index 00000000..e4a0510d --- /dev/null +++ b/forum/migrations/0003_forum_owner_club.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('club', '0006_auto_20161229_0040'), + ('forum', '0002_auto_20170128_1958'), + ] + + operations = [ + migrations.AddField( + model_name='forum', + name='owner_club', + field=models.ForeignKey(related_name='owned_forums', verbose_name='owner club', to='club.Club', default=1), + ), + ] diff --git a/forum/models.py b/forum/models.py index a69e5b0d..781b90aa 100644 --- a/forum/models.py +++ b/forum/models.py @@ -8,6 +8,7 @@ from django.core.urlresolvers import reverse from django.utils import timezone from core.models import User, MetaGroup, Group, SithFile +from club.models import Club class Forum(models.Model): """ @@ -17,13 +18,45 @@ class Forum(models.Model): description = models.CharField(_('description'), max_length=256, default="") is_category = models.BooleanField(_('is a category'), default=False) parent = models.ForeignKey('Forum', related_name='children', null=True, blank=True) + owner_club = models.ForeignKey(Club, related_name="owned_forums", verbose_name=_("owner club"), + default=settings.SITH_MAIN_CLUB_ID) edit_groups = models.ManyToManyField(Group, related_name="editable_forums", blank=True, default=[settings.SITH_GROUP_OLD_SUBSCRIBERS_ID]) view_groups = models.ManyToManyField(Group, related_name="viewable_forums", blank=True, default=[settings.SITH_GROUP_PUBLIC_ID]) + def clean(self): + self.check_loop() + + def save(self, *args, **kwargs): + copy_rights = False + if self.id is None: + copy_rights = True + super(Forum, self).save(*args, **kwargs) + if copy_rights: + self.copy_rights() + + def apply_rights_recursively(self): + children = self.children.all() + for c in children: + c.copy_rights() + c.apply_rights_recursively() + + def copy_rights(self): + """Copy, if possible, the rights of the parent folder""" + if self.parent is not None: + self.owner_club = self.parent.owner_club + self.edit_groups = self.parent.edit_groups.all() + self.view_groups = self.parent.view_groups.all() + self.save() + def is_owned_by(self, user): - return user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) + if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID): + return True + m = self.owner_club.get_membership_for(user) + if m: + return m.role > settings.SITH_MAXIMUM_FREE_ROLE + return False def check_loop(self): """Raise a validation error when a loop is found within the parent list""" @@ -35,9 +68,6 @@ class Forum(models.Model): objs.append(cur) cur = cur.parent - def clean(self): - self.check_loop() - def __str__(self): return "%s" % (self.name) @@ -73,7 +103,6 @@ class Forum(models.Model): class ForumTopic(models.Model): forum = models.ForeignKey(Forum, related_name='topics') author = models.ForeignKey(User, related_name='forum_topics') - title = models.CharField(_("title"), default="", max_length=64) description = models.CharField(_('description'), max_length=256, default="") class Meta: @@ -94,6 +123,10 @@ class ForumTopic(models.Model): def get_absolute_url(self): return reverse('forum:view_topic', kwargs={'topic_id': self.id}) + @property + def title(self): + return self.messages.order_by('date').first().title + class ForumMessage(models.Model): """ "A ForumMessage object represents a message in the forum" -- Cpt. Obvious diff --git a/forum/templates/forum/forum.jinja b/forum/templates/forum/forum.jinja index 624b13f2..747acf1c 100644 --- a/forum/templates/forum/forum.jinja +++ b/forum/templates/forum/forum.jinja @@ -11,9 +11,14 @@ > {{ forum }}

{{ forum.name }}

- New forum +

+ {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %} + New forum
+ {% endif %} + New topic +

{% for f in forum.children.all() %} - {{ display_forum(f) }} + {{ display_forum(f, user) }} {% endfor %} {% for t in topics %}
@@ -22,7 +27,7 @@
{{ t.title }}

{{ t.description }}

- {% if user.can_edit(t) %} + {% if user.is_owner(t) %}
Edit
@@ -45,7 +50,6 @@
{% endfor %} - New topic {% endblock %} diff --git a/forum/templates/forum/macros.jinja b/forum/templates/forum/macros.jinja index 1e83ac80..6e924531 100644 --- a/forum/templates/forum/macros.jinja +++ b/forum/templates/forum/macros.jinja @@ -1,4 +1,4 @@ -{% macro display_forum(forum) %} +{% macro display_forum(forum, user) %}
{% if not forum.is_category %} @@ -13,7 +13,10 @@ {% else %}
{% endif %} + {% if user.is_owner(forum) %} Edit + Delete + {% endif %}
{% if not forum.is_category %}
diff --git a/forum/templates/forum/main.jinja b/forum/templates/forum/main.jinja index ab83abf3..49c0f976 100644 --- a/forum/templates/forum/main.jinja +++ b/forum/templates/forum/main.jinja @@ -7,12 +7,16 @@ Forum >

{% trans %}Forum{% endtrans %}

- New forum +

+ {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %} + New forum + {% endif %} +

{% for f in forum_list %}
- {{ display_forum(f) }} + {{ display_forum(f, user) }} {% for c in f.children.all() %} - {{ display_forum(c) }} + {{ display_forum(c, user) }} {% endfor %}
{% endfor %} diff --git a/forum/urls.py b/forum/urls.py index e7e8ae8d..e8abf4a5 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ url(r'^new_forum$', ForumCreateView.as_view(), name='new_forum'), url(r'^(?P[0-9]+)$', ForumDetailView.as_view(), name='view_forum'), url(r'^(?P[0-9]+)/edit$', ForumEditView.as_view(), name='edit_forum'), + url(r'^(?P[0-9]+)/delete$', ForumDeleteView.as_view(), name='delete_forum'), url(r'^(?P[0-9]+)/new_topic$', ForumTopicCreateView.as_view(), name='new_topic'), url(r'^topic/(?P[0-9]+)$', ForumTopicDetailView.as_view(), name='view_topic'), url(r'^topic/(?P[0-9]+)/edit$', ForumTopicEditView.as_view(), name='edit_topic'), diff --git a/forum/views.py b/forum/views.py index 73da4e56..73691be0 100644 --- a/forum/views.py +++ b/forum/views.py @@ -18,7 +18,7 @@ class ForumMainView(CanViewMixin, ListView): class ForumCreateView(CanCreateMixin, CreateView): model = Forum - fields = ['name', 'parent', 'is_category', 'edit_groups', 'view_groups'] + fields = ['name', 'parent', 'owner_club', 'is_category', 'edit_groups', 'view_groups'] template_name = "core/create.jinja" def get_initial(self): @@ -26,16 +26,35 @@ class ForumCreateView(CanCreateMixin, CreateView): try: parent = Forum.objects.filter(id=self.request.GET['parent']).first() init['parent'] = parent + init['owner_club'] = parent.owner_club except: pass return init +class ForumEditForm(forms.ModelForm): + class Meta: + model = Forum + fields = ['name', 'parent', 'owner_club', 'is_category', 'edit_groups', 'view_groups'] + recursive = forms.BooleanField(label=_("Apply rights and club owner recursively"), required=False) + class ForumEditView(CanEditPropMixin, UpdateView): model = Forum pk_url_kwarg = "forum_id" - fields = ['name', 'parent', 'is_category', 'edit_groups', 'view_groups'] + form_class = ForumEditForm template_name = "core/edit.jinja" success_url = reverse_lazy('forum:main') + def form_valid(self, form): + ret = super(ForumEditView, self).form_valid(form) + if form.cleaned_data['recursive']: + self.object.apply_rights_recursively() + return ret + +class ForumDeleteView(CanEditPropMixin, DeleteView): + model = Forum + pk_url_kwarg = "forum_id" + template_name = "core/delete_confirm.jinja" + success_url = reverse_lazy('forum:main') + class ForumDetailView(CanViewMixin, DetailView): model = Forum template_name = "forum/forum.jinja" diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja index 74091964..eb18a4e1 100644 --- a/sas/templates/sas/album.jinja +++ b/sas/templates/sas/album.jinja @@ -39,7 +39,7 @@ {% endif %} {% endif %}
- {% for a in album.children_albums.order_by('-id') %} + {% for a in album.children_albums.order_by('-date') %}
{% if edit_mode %} diff --git a/sith/settings.py b/sith/settings.py index 5bbcacdf..e2224b32 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -232,6 +232,7 @@ SITH_URL = "my.url.git.an" SITH_NAME = "Sith website" # AE configuration +SITH_MAIN_CLUB_ID = 1 # TODO: keep only that first setting, with the ID, and do the same for the other clubs SITH_MAIN_CLUB = { 'name': "AE", 'unix_name': "ae",