diff --git a/forums/forms.py b/forums/forms.py
index ce91c1096fc169289f02684f29d570feeaff8de8..76c774e4e7223a788676ac7af3fc969dad089cd9 100644
--- a/forums/forms.py
+++ b/forums/forms.py
@@ -12,7 +12,8 @@ from .models import Forum, Post
class ForumForm(forms.ModelForm):
class Meta:
model = Forum
- fields = ['name', 'slug', 'publicly_visible', 'moderators',
+ fields = ['name', 'slug', 'description',
+ 'publicly_visible', 'moderators',
'parent_content_type', 'parent_object_id']
def __init__(self, *args, **kwargs):
diff --git a/forums/migrations/0005_forum_description.py b/forums/migrations/0005_forum_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..609fd9d50e9c35893595cb686385bbdf13a4b35b
--- /dev/null
+++ b/forums/migrations/0005_forum_description.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-03-09 05:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('forums', '0004_auto_20190308_1055'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='forum',
+ name='description',
+ field=models.TextField(blank=True, help_text='You can use ReStructuredText, see a <a href="https://devguide.python.org/documenting/#restructuredtext-primer" target="_blank">primer on python.org</a>', null=True),
+ ),
+ ]
diff --git a/forums/models.py b/forums/models.py
index b80d5557435c5a8048c904f6d44cdaaa36b67ce2..ae15f3a8e2cd5da606e193fe82e1e3d2bea22514 100644
--- a/forums/models.py
+++ b/forums/models.py
@@ -27,6 +27,13 @@ class Forum(models.Model):
"""
name = models.CharField(max_length=256)
slug = models.SlugField(allow_unicode=True)
+ description = models.TextField(
+ blank=True, null=True,
+ help_text=(
+ 'You can use ReStructuredText, see a '
+ '<a href="https://devguide.python.org/documenting/#restructuredtext-primer" '
+ 'target="_blank">primer on python.org</a>')
+ )
publicly_visible = models.BooleanField(default=False)
moderators = models.ManyToManyField('auth.User', related_name='moderated_forums')
@@ -117,7 +124,12 @@ class Post(models.Model):
object_id_field='parent_object_id',
related_query_name='parent_posts')
subject = models.CharField(max_length=256)
- text = models.TextField(help_text='You can use ReStructuredText, see a <a href="https://devguide.python.org/documenting/#restructuredtext-primer" target="_blank">primer on python.org</a>')
+ text = models.TextField(
+ help_text=(
+ 'You can use ReStructuredText, see a '
+ '<a href="https://devguide.python.org/documenting/#restructuredtext-primer" '
+ 'target="_blank">primer on python.org</a>')
+ )
class Meta:
ordering = ['posted_on',]
diff --git a/forums/templates/forums/forum_confirm_delete.html b/forums/templates/forums/forum_confirm_delete.html
index 6727f68effa8c19f673a02381580b65c81bf2905..e1b83558d653e628e3a1a2e7c9c3b05447eb5904 100644
--- a/forums/templates/forums/forum_confirm_delete.html
+++ b/forums/templates/forums/forum_confirm_delete.html
@@ -1,6 +1,7 @@
{% extends 'forums/base.html' %}
{% load bootstrap %}
+{% load restructuredtext %}
{% block pagetitle %}: Delete Forum{% endblock pagetitle %}
@@ -8,11 +9,21 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Delete Forum</h1>
- {{ object }}
+
+ <h3 class="highlight">Description</h3>
+ {{ object.description|restructuredtext }}
+
+ <h3 class="highlight">Posts</h3>
+ {% for post in object.posts.all %}
+ {% include 'forums/post_card.html' with forum=object post=post %}
+ {% endfor %}
+
</div>
</div>
+
<div class="row">
<div class="col-12">
+
<form method="post">
{% csrf_token %}
<h3 class="mb-2">Are you sure you want to delete this Forum (and all associated Posts)?</h3>
diff --git a/forums/templates/forums/forum_detail.html b/forums/templates/forums/forum_detail.html
index 425c7889085274f297e4e177e3119ce92c49619b..5820665ae13e29b6948aa661563539884112a901 100644
--- a/forums/templates/forums/forum_detail.html
+++ b/forums/templates/forums/forum_detail.html
@@ -2,6 +2,7 @@
{% load bootstrap %}
{% load guardian_tags %}
+{% load restructuredtext %}
{% block breadcrumb_items %}
{{ block.super }}
@@ -32,14 +33,15 @@
{% if perms.forums.add_forum or "can_change_forum" in user_perms %}
<h4>Admin actions:</h4>
<ul>
- <li><a href="{% url 'forums:forum_create' parent_model='forum' parent_id=forum.id %}">Create a (sub)Forum within this one</a></li>
+ <li><a href="{% url 'forums:forum_update' slug=forum.slug %}" class="text-warning">Update this Forum</a></li>
<li>
- {% if not forum.child_forums %}
+ {% if not forum.child_forums.all|length > 0 %}
<a href="{% url 'forums:forum_delete' slug=forum.slug %}" class="text-danger">Delete this Forum (and all Posts it contains)</a>
{% else %}
<span class="text-danger" style="text-decoration: line-through;">Delete this Forum</span> Please delete descendant Forums first.
{% endif %}
</li>
+ <li><a href="{% url 'forums:forum_create' parent_model='forum' parent_id=forum.id %}">Create a (sub)Forum within this one</a></li>
</ul>
<div class="card">
@@ -72,6 +74,11 @@
{% endif %}
+ <h3 class="highlight">Description</h3>
+ {{ forum.description|restructuredtext }}
+
+ <h3 class="highlight">Posts</h3>
+
{% for post in forum.posts.all %}
{% include 'forums/post_card.html' with forum=forum post=post %}
{% endfor %}
diff --git a/forums/templates/forums/forum_list.html b/forums/templates/forums/forum_list.html
index d5f0b6948ace9de47bcd2f8352f75375faea8d64..b4a815c4b91411c33b0cef62ce2da8b3de2fb17f 100644
--- a/forums/templates/forums/forum_list.html
+++ b/forums/templates/forums/forum_list.html
@@ -1,6 +1,7 @@
{% extends 'forums/base.html' %}
{% load bootstrap %}
+{% load restructuredtext %}
{% block breadcrumb_items %}
@@ -31,7 +32,7 @@
<span class="badge badge-primary badge-pill">{{ forum.nr_posts }} post{{ forum.nr_posts|pluralize }}</span>
</div>
<div class="card-body">
- Forum description
+ {{ forum.description|restructuredtext }}
{% if forum.child_forums.all|length > 0 %}
<hr/>
<p>Descendants:</p>
diff --git a/forums/urls.py b/forums/urls.py
index f2577a96f66a67b639c5015c2c4245bf98ec48b7..989b3229c9a40e266205309076b0b33bf23675c9 100644
--- a/forums/urls.py
+++ b/forums/urls.py
@@ -22,6 +22,11 @@ urlpatterns = [
views.ForumDetailView.as_view(),
name='forum_detail'
),
+ url(
+ r'^(?P<slug>[\w-]+)/update/$',
+ views.ForumUpdateView.as_view(),
+ name='forum_update'
+ ),
url(
r'^(?P<slug>[\w-]+)/delete/$',
views.ForumDeleteView.as_view(),
diff --git a/forums/views.py b/forums/views.py
index 41429eb72b1413fbe4cc3fa70b77251a0e63c558..5716fbd208fa352b86d064d494e77c6993a7c409 100644
--- a/forums/views.py
+++ b/forums/views.py
@@ -49,6 +49,13 @@ class ForumCreateView(PermissionsMixin, CreateView):
return initial
+class ForumUpdateView(PermissionRequiredMixin, UpdateView):
+ permission_required = 'forums.update_forum'
+ model = Forum
+ form_class = ForumForm
+ template_name = 'forums/forum_form.html'
+
+
class ForumDeleteView(PermissionRequiredMixin, DeleteView):
permission_required = 'forums.delete_forum'
model = Forum
diff --git a/scipost/templatetags/restructuredtext.py b/scipost/templatetags/restructuredtext.py
index 535184b647cdbdda568d3802276aafa0229062e0..a13399059e21a450dc9e25be57dcf159a253094a 100644
--- a/scipost/templatetags/restructuredtext.py
+++ b/scipost/templatetags/restructuredtext.py
@@ -12,6 +12,8 @@ register = template.Library()
@register.filter(name='restructuredtext')
def restructuredtext(text):
+ if not text:
+ return ''
from docutils.core import publish_parts
parts = publish_parts(source=text,
writer_name='html5_polyglot')