Rafał Pitoń 10 лет назад
Родитель
Сommit
cfbc1ec0c0
2 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      misago/forums/migrations/0003_forums_roles.py
  2. 5 5
      misago/threads/permissions.py

+ 1 - 1
misago/forums/migrations/0003_forums_roles.py

@@ -136,7 +136,7 @@ def create_default_forums_roles(apps, schema_editor):
                 'can_review_moderated_content': 1,
                 'can_review_moderated_content': 1,
                 'can_report_content': 1,
                 'can_report_content': 1,
                 'can_see_reports': 1,
                 'can_see_reports': 1,
-                'can_can_hide_events': 1,
+                'can_hide_events': 2,
             },
             },
         })
         })
     moderator.save()
     moderator.save()

+ 5 - 5
misago/threads/permissions.py

@@ -174,7 +174,7 @@ def build_forum_acl(acl, forum, forums_roles, key_name):
         'can_review_moderated_content': 0,
         'can_review_moderated_content': 0,
         'can_report_content': 0,
         'can_report_content': 0,
         'can_see_reports': 0,
         'can_see_reports': 0,
-        'can_can_hide_events': 0,
+        'can_hide_events': 0,
     }
     }
     final_acl.update(acl)
     final_acl.update(acl)
 
 
@@ -202,7 +202,7 @@ def build_forum_acl(acl, forum, forums_roles, key_name):
         can_review_moderated_content=algebra.greater,
         can_review_moderated_content=algebra.greater,
         can_report_content=algebra.greater,
         can_report_content=algebra.greater,
         can_see_reports=algebra.greater,
         can_see_reports=algebra.greater,
-        can_can_hide_events=algebra.greater,
+        can_hide_events=algebra.greater,
     )
     )
 
 
     return final_acl
     return final_acl
@@ -249,7 +249,7 @@ def add_acl_to_forum(user, forum):
         'can_review_moderated_content': 0,
         'can_review_moderated_content': 0,
         'can_report_content': 0,
         'can_report_content': 0,
         'can_see_reports': 0,
         'can_see_reports': 0,
-        'can_can_hide_events': 0,
+        'can_hide_events': 0,
     })
     })
 
 
     algebra.sum_acls(forum.acl, acls=[forum_acl],
     algebra.sum_acls(forum.acl, acls=[forum_acl],
@@ -279,7 +279,7 @@ def add_acl_to_forum(user, forum):
             can_review_moderated_content=algebra.greater,
             can_review_moderated_content=algebra.greater,
             can_report_content=algebra.greater,
             can_report_content=algebra.greater,
             can_see_reports=algebra.greater,
             can_see_reports=algebra.greater,
-            can_can_hide_events=algebra.greater,
+            can_hide_events=algebra.greater,
         )
         )
 
 
     forum.acl['can_see_own_threads'] = not forum.acl['can_see_all_threads']
     forum.acl['can_see_own_threads'] = not forum.acl['can_see_all_threads']
@@ -312,7 +312,7 @@ def add_acl_to_post(user, post):
 
 
 def add_acl_to_event(user, event):
 def add_acl_to_event(user, event):
     forum_acl = user.acl['forums'].get(event.forum_id, {})
     forum_acl = user.acl['forums'].get(event.forum_id, {})
-    can_hide_events = forum_acl.get('can_can_hide_events', 0)
+    can_hide_events = forum_acl.get('can_hide_events', 0)
 
 
     event.acl['can_hide'] = can_hide_events > 0
     event.acl['can_hide'] = can_hide_events > 0
     event.acl['can_delete'] = can_hide_events == 2
     event.acl['can_delete'] = can_hide_events == 2