Просмотр исходного кода

Fixed showstopper on ACL request

Rafał Pitoń 11 лет назад
Родитель
Сommit
94ff26d44a

+ 1 - 1
misago/apps/privatethreads/forms.py

@@ -26,7 +26,7 @@ class InviteUsersMixin(object):
                 usernames.append(username)
                 try:
                     user = User.objects.get(username_slug=slug)
-                    if not user.acl(self.request).private_threads.can_participate():
+                    if not user.acl().private_threads.can_participate():
                         raise forms.ValidationError(_('%(user)s cannot participate in private threads.') % {'user': user.username})
                     if (not self.request.acl.private_threads.can_invite_ignoring() and
                             not user.allow_pd_invite(self.request.user)):

+ 1 - 1
misago/apps/privatethreads/jumps.py

@@ -58,7 +58,7 @@ class InviteUserView(JumpView, TypeMixin):
             return self.retreat_redirect()
         try:
             user = User.objects.get(username_slug=username)
-            acl = user.acl(self.request)
+            acl = user.acl()
             if user in self.thread.participants.all():
                 if user.pk == self.request.user.pk:
                     messages.error(self.request, _('You cannot add yourself to this thread.'), 'threads')

+ 1 - 1
misago/apps/privatethreads/mixins.py

@@ -41,7 +41,7 @@ class TypeMixin(object):
             if self.md.mentions:
                 participants = self.thread.participants.all()
                 for slug, user in self.md.mentions.items():
-                    user_acl = user.acl(self.request)
+                    user_acl = user.acl()
                     if not (user in participants or (user_acl.private_threads.can_participate() and user_acl.private_threads.is_mod() and self.thread.replies_reported > 0)):
                         del self.md.mentions[slug]
         except AttributeError:

+ 1 - 1
misago/apps/privatethreads/posting.py

@@ -19,7 +19,7 @@ class NewThreadView(NewThreadBaseView, TypeMixin):
         if self.kwargs.get('user'):
             try:
                 user = User.objects.get(id=self.kwargs.get('user'))
-                acl = user.acl(self.request)
+                acl = user.acl()
                 if not acl.private_threads.can_participate():
                     raise ACLError403(_("This member can not participate in private threads."))
                 if (not self.request.acl.private_threads.can_invite_ignoring() and