diff options
-rw-r--r-- | install/ui/src/freeipa/user.js | 10 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 4 | ||||
-rw-r--r-- | ipalib/plugins/internal.py | 2 | ||||
-rw-r--r-- | ipatests/test_webui/test_user.py | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 73298093b..337405050 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -270,12 +270,20 @@ return { 'delete', 'reset_password', { + $factory: IPA.object_action, + name: 'unlock', + method: 'unlock', + label: '@i18n:objects.user.unlock', + needs_confirm: true, + confirm_msg: '@i18n:objects.user.unlock_confirm' + }, + { $type: 'automember_rebuild', name: 'automember_rebuild', label: '@i18n:actions.automember_rebuild' } ], - header_actions: ['reset_password', 'enable', 'disable', 'delete', 'automember_rebuild'], + header_actions: ['reset_password', 'enable', 'disable', 'delete', 'unlock', 'automember_rebuild'], state: { evaluators: [ { diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 83ed670d0..6c387690a 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -500,7 +500,9 @@ "mailing": "Mailing Address", "misc": "Misc. Information", "status_confirmation": "Are you sure you want to ${action} the user?<br/>The change will take effect immediately.", - "status_link": "Click to ${action}" + "status_link": "Click to ${action}", + "unlock": "Unlock", + "unlock_confirm": "Are you sure you want to unlock user ${object}?" } }, "password": { diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 731142cd5..d95794cc6 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -646,6 +646,8 @@ class i18n_messages(Command): "misc": _("Misc. Information"), "status_confirmation": _("Are you sure you want to ${action} the user?<br/>The change will take effect immediately."), "status_link": _("Click to ${action}"), + "unlock": _("Unlock"), + "unlock_confirm": _("Are you sure you want to unlock user ${object}?"), }, }, "password": { diff --git a/ipatests/test_webui/test_user.py b/ipatests/test_webui/test_user.py index 4c189db89..d7087b906 100644 --- a/ipatests/test_webui/test_user.py +++ b/ipatests/test_webui/test_user.py @@ -156,6 +156,8 @@ class test_user(UI_driver): self.reset_password_action(pwd) self.assert_text_field('has_password', '******') + self.action_list_action('unlock') + # delete self.delete_action(user.ENTITY, user.PKEY) |