Merge lp:~roadmr/canonical-identity-provider/suspend-admin-action into lp:canonical-identity-provider/release

[Daniel Manrique]

Add admin list action to suspend accounts.

This is handy if the account in question has e.g. thousands of e-mail addresses (grounds for suspension!) which makes the account change page unusable. With this, the suspend can be applied from the accounts list page.

Add admin list action to suspend accounts.

This is handy if the account in question has e.g. thousands of e-mail addresses (grounds for suspension!) which makes the account change page unusable. With this, the suspend can be applied from the accounts list page.

[Maximiliano Bertacchini (maxiberta)]

LGTM, with a couple of nitpicks.

review: Approve

[Daniel Manrique (roadmr)]

Made changes per review!

review: Approve

[Maximiliano Bertacchini (maxiberta)]

review: Approve

=== modified file 'src/identityprovider/admin.py'
--- src/identityprovider/admin.py	2018-02-20 15:45:11 +0000
+++ src/identityprovider/admin.py	2018-05-14 14:21:32 +0000
@@ -291,6 +291,7 @@
 
 
 class AccountAdmin(LargeTableMixin, admin.ModelAdmin):
+    actions = ['suspend']
     inlines = [AccountPasswordInline, EmailAddressInline,
                AuthenticationDeviceInline]
     readonly_fields = ('date_created',)
@@ -366,6 +367,16 @@
             super(AccountAdmin, self).save_formset(
                 request, form, formset, change)
 
+    def suspend(self, request, queryset):
+        """Suspend the selected accounts."""
+        for account in queryset.all():
+            account.status = AccountStatus.SUSPENDED
+            account.save()
+        self.message_user(
+            request, "Suspended %s accounts" % queryset.count())
+
+    suspend.short_description = "Suspend accounts"
+
 
 class APIUserAdminForm(forms.ModelForm):
 
 
=== modified file 'src/identityprovider/tests/test_admin.py'
--- src/identityprovider/tests/test_admin.py	2018-05-09 22:00:09 +0000
+++ src/identityprovider/tests/test_admin.py	2018-05-14 14:21:32 +0000
@@ -693,3 +693,29 @@
             response, reverse('admin:identityprovider_account_change',
                               args=(self.account.id,)))
         self.assertNotContains(response, self.account.displayname)
+
+
+class AccountAdminTestCase(SSOBaseTestCase):
+
+    def setUp(self):
+        super(AccountAdminTestCase, self).setUp()
+        self.admin = self.factory.make_account(
+            is_superuser=True, password="admin007")
+        assert self.client.login(
+            username=self.admin.user.email, password="admin007")
+        self.accounts = [self.factory.make_account() for _ in range(2)]
+
+    def test_account_suspend_action(self):
+        assert all((
+            account.status != AccountStatus.SUSPENDED
+            for account in self.accounts))
+        action_data = {
+            'action': 'suspend',
+            '_selected_action': [account.pk for account in self.accounts]
+        }
+        self.client.post(
+            reverse('admin:identityprovider_account_changelist'),
+            action_data, follow=True)
+        for account in self.accounts:
+            account.refresh_from_db()
+            self.assertEqual(account.status, AccountStatus.SUSPENDED)