Merge d4a9340 into 154dd0c

liqd · Apr 27, 2020 · f82f887 · f82f887
2 parents 154dd0c + d4a9340
commit f82f887
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/euth/communitydebate/phases.py b/euth/communitydebate/phases.py
@@ -17,6 +17,8 @@ class DebatePhase(phases.PhaseContent):
 
     features = {
         'crud': (models.Topic,),
+        'comment': (models.Topic,),
+        'rate': (models.Topic,),
     }
 
 

diff --git a/euth/communitydebate/rules.py b/euth/communitydebate/rules.py
@@ -5,10 +5,18 @@
                                            is_context_member,
                                            is_context_moderator, is_owner,
                                            is_public_context)
-from adhocracy4.phases.predicates import phase_allows_add, phase_allows_change
+from adhocracy4.phases.predicates import (phase_allows_add,
+                                          phase_allows_change,
+                                          phase_allows_comment,
+                                          phase_allows_rate)
 
 from .models import Topic
 
+rules.add_perm('euth_communitydebate.comment_topic',
+               is_superuser | is_context_moderator | is_context_initiator |
+               (is_context_member & phase_allows_comment))
+
+
 rules.add_perm('euth_communitydebate.modify_topic',
                is_superuser | is_context_moderator | is_context_initiator |
                (is_context_member & is_owner & phase_allows_change))
@@ -19,6 +27,11 @@
                (is_context_member & phase_allows_add(Topic)))
 
 
+rules.add_perm('euth_communitydebate.rate_topic',
+               is_superuser | is_context_moderator | is_context_initiator |
+               (is_context_member & phase_allows_rate))
+
+
 rules.add_perm('euth_communitydebate.view_topic',
                is_superuser | is_context_moderator | is_context_initiator |
                is_context_member | is_public_context)
diff --git a/euth/communitydebate/templates/euth_communitydebate/topic_detail.html b/euth/communitydebate/templates/euth_communitydebate/topic_detail.html
@@ -65,7 +65,7 @@ <h1>{{ topic.name }}</h1>
             </div>
 
             <div class="mt-5">
-                {% react_comments_async topic %}
+                {% react_comments_async topic True %}
             </div>
        </div>
     </div>

diff --git a/euth_wagtail/settings/base.py b/euth_wagtail/settings/base.py
@@ -427,6 +427,12 @@
     ('a4polls', 'poll')
 )
 
+A4_COMMENT_CATEGORIES = (
+    ('sug', _('suggestion')),
+    ('not', _('note')),
+    ('que', _('question'))
+)
+
 A4_RATEABLES = (
     ('euth_communitydebate', 'topic'),
     ('euth_ideas', 'idea'),