Merge pull request #15 from johncronan/dev

make active/inactive action for users; reviewpanel 0.7.1

formative/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.2"
+__version__ = "0.9.3"

formative/admin/formative.py

@@ -61,7 +61,7 @@ def register_submission_models(self):
 @admin.register(auth.models.User, site=site)
 class UserAdmin(UserActionsMixin, auth.admin.UserAdmin):
     change_list_template = 'admin/formative/user/change_list.html'
-    actions = ['send_password_reset']
+    actions = ['make_active', 'make_inactive', 'send_password_reset']
 
     def get_actions(self, request):
         actions = super().get_actions(request)
@@ -72,6 +72,16 @@ def get_actions(self, request):
             func.__name__ = name
             actions[name] = self.get_action(func)
         return actions
+
+    def make_active_ornot(self, request, qs, active=True):
+        for obj in qs:
+            obj.is_active = active
+            obj.save()
+        self.message_user(request, 'User status changed.')
+    def make_active(self, request, queryset):
+        return self.make_active_ornot(request, queryset)
+    def make_inactive(self, request, queryset):
+        return self.make_active_ornot(request, queryset, active=False)
 
 
 @admin.register(Program, site=site)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "formative"
-version = "0.9.2"
+version = "0.9.3"
 description = "Self-hosted web app for collecting form responses and files"
 authors = ["John Kyle Cronan"]
 license = "LGPL-2.1"
@@ -54,7 +54,7 @@ markdown-link-attr-modifier = "^0.2.0"
 django-better-admin-arrayfield = "^1.4.2"
 django-admin-inline-paginator = "*"
 whitenoise = "^6.0.0"
-reviewpanel = { version = "^0.6.5", optional = true }
+reviewpanel = { version = "^0.7.1", optional = true }
 
 [tool.poetry.dev-dependencies]
 pytest = "*"