Forum permission fix and form display

forum/models.py

@@ -143,6 +143,12 @@ class Forum(models.Model):
     def __str__(self):
         return "%s" % (self.name)
 
+    def get_full_name(self):
+        name = ''
+        for parent in self.get_parent_list():
+            name += parent.name + '/'
+        return name + self.name
+
     def get_absolute_url(self):
         return reverse('forum:view_forum', kwargs={'forum_id': self.id})
 

forum/templates/forum/forum.jinja

@@ -16,7 +16,7 @@
 <div id="forum">
     <h3>{{ forum.name }}</h3>
     <p>
-    {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+    {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or user.can_edit(forum) %}
         <a class="ib button" href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
     {% endif %}
     {% if not forum.is_category %}

forum/views.py

@@ -71,6 +71,7 @@ class ForumFavoriteTopics(ListView):
         topic_list = self.request.user.favorite_topics.all()
         return topic_list
 
+
 class ForumLastUnread(ListView):
     model = ForumTopic
     template_name = "forum/last_unread.jinja"
@@ -85,12 +86,18 @@ class ForumLastUnread(ListView):
         return topic_list
 
 
+class ForumNameField(forms.ModelChoiceField):
+    def label_from_instance(self, obj):
+        return obj.get_full_name()
+
+
 class ForumForm(forms.ModelForm):
     class Meta:
         model = Forum
         fields = ['name', 'parent', 'number', 'owner_club', 'is_category', 'edit_groups', 'view_groups']
     edit_groups = make_ajax_field(Forum, 'edit_groups', 'groups', help_text="")
     view_groups = make_ajax_field(Forum, 'view_groups', 'groups', help_text="")
+    parent = ForumNameField(Forum.objects.all())
 
 
 class ForumCreateView(CanCreateMixin, CreateView):