Browse Source

Finally fixed build.

Rafał Pitoń 11 years ago
parent
commit
6768b5df0c

+ 0 - 9
misago/forums/models.py

@@ -91,15 +91,6 @@ class RoleForumACL(models.Model):
     forum = models.ForeignKey('Forum')
     forum = models.ForeignKey('Forum')
     forum_role = models.ForeignKey(ForumRole)
     forum_role = models.ForeignKey(ForumRole)
 
 
-    def save(self, *args, **kwargs):
-        if not self.pk:
-            acl_version.invalidate()
-        return super(RoleForumACL, self).save(*args, **kwargs)
-
-    def delete(self, *args, **kwargs):
-        acl_version.invalidate()
-        return super(RoleForumACL, self).delete(*args, **kwargs)
-
 
 
 """register model in misago admin"""
 """register model in misago admin"""
 site.add_node(
 site.add_node(

+ 0 - 3
misago/forums/views/forumsadmin.py

@@ -2,7 +2,6 @@ import warnings
 from django.contrib import messages
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
-from misago.acl import version
 from misago.admin.views import generic
 from misago.admin.views import generic
 from misago.forums.models import FORUMS_TREE_ID, Forum
 from misago.forums.models import FORUMS_TREE_ID, Forum
 from misago.forums.forms import ForumFormFactory, DeleteFormFactory
 from misago.forums.forms import ForumFormFactory, DeleteFormFactory
@@ -63,7 +62,6 @@ class ForumFormMixin(object):
                                     position='last-child',
                                     position='last-child',
                                     save=True)
                                     save=True)
 
 
-        cachebuster.invalidate()
         messages.success(request, self.message_submit % target.name)
         messages.success(request, self.message_submit % target.name)
 
 
 
 
@@ -97,7 +95,6 @@ class DeleteForum(ForumAdmin, generic.ModelFormView):
                           FutureWarning)
                           FutureWarning)
 
 
         form.instance.delete()
         form.instance.delete()
-        cachebuster.invalidate()
 
 
         messages.success(request, self.message_submit % target.name)
         messages.success(request, self.message_submit % target.name)
         return redirect(self.root_link)
         return redirect(self.root_link)

+ 2 - 2
misago/forums/views/permsadmin.py

@@ -2,7 +2,7 @@ from django.contrib import messages
 from django.shortcuts import redirect
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 from misago.admin.views import generic
 from misago.admin.views import generic
-from misago.acl import cachebuster
+from misago.acl import version as acl_version
 from misago.acl.forms import get_permissions_forms
 from misago.acl.forms import get_permissions_forms
 from misago.acl.views import RoleAdmin, RolesList
 from misago.acl.views import RoleAdmin, RolesList
 from misago.forums.forms import ForumRoleForm, RoleForumACLFormFactory
 from misago.forums.forms import ForumRoleForm, RoleForumACLFormFactory
@@ -126,7 +126,7 @@ class RoleForumsACL(RoleAdmin, generic.ModelFormView):
             if new_permissions:
             if new_permissions:
                 RoleForumACL.objects.bulk_create(new_permissions)
                 RoleForumACL.objects.bulk_create(new_permissions)
 
 
-            cachebuster.invalidate()
+            acl_version.invalidate()
 
 
             message = _("Forum permissions for role %s have been changed.")
             message = _("Forum permissions for role %s have been changed.")
             messages.success(request, message % target)
             messages.success(request, message % target)