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

Fixed prune users admin action

Rafał Pitoń 11 лет назад
Родитель
Сommit
e63d3f2dec
2 измененных файлов с 4 добавлено и 5 удалено
  1. 3 4
      misago/apps/admin/pruneusers/views.py
  2. 1 1
      misago/models/pruningpolicymodel.py

+ 3 - 4
misago/apps/admin/pruneusers/views.py

@@ -167,9 +167,8 @@ class Apply(FormWidget):
         original_model = model
 
         # Set filter
-        users = model.get_model()
-        total_users = users
-        total_users = total_users.count()
+        users = model.make_queryset()
+        total_users = users.count()
 
         if not total_users:
             messages.error(request, _('Policy "%(name)s" does not apply to any users.') % {'name': model.name}, self.admin.id)
@@ -203,7 +202,7 @@ class Apply(FormWidget):
                                   'admin': self.admin,
                                   'action': self,
                                   'request': request,
-                                  'url': self.get_link(model),
+                                  'link': self.get_link(model),
                                   'fallback': self.get_fallback_link(),
                                   'messages': messages.get_messages(request, self.admin.id),
                                   'message': message,

+ 1 - 1
misago/models/pruningpolicymodel.py

@@ -16,7 +16,7 @@ class PruningPolicy(models.Model):
         app_label = 'misago'
 
     def clean(self):
-        if not (self.email and self.posts and self.registered and self.last_visit):
+        if not (self.email or self.posts or self.registered or self.last_visit):
             raise ValidationError(_("Pruning policy must have at least one pruning criteria set to be valid."))
 
     def make_queryset(self):