diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-04-14 17:01:46 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-06 17:17:20 +0200 |
| commit | b4c0f08533d850a55e35a20e2f211d77a43fd2cb (patch) | |
| tree | 9801f984b5431954f30b1486d6d8095365369dbe | |
| parent | 98f7db40f0314d29cc52381634c49e685beb7501 (diff) | |
| download | freeipa-b4c0f08533d850a55e35a20e2f211d77a43fd2cb.tar.gz freeipa-b4c0f08533d850a55e35a20e2f211d77a43fd2cb.tar.xz freeipa-b4c0f08533d850a55e35a20e2f211d77a43fd2cb.zip | |
webui: move user reset password action to action dropdown
| -rw-r--r-- | install/ui/src/freeipa/user.js | 7 | ||||
| -rw-r--r-- | ipatests/test_webui/test_user.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index de3841eeb..270f0b2cc 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -120,11 +120,6 @@ return { }, { name: 'account', - action_panel: { - $factory: IPA.action_panel, - name: 'account_actions', - actions: ['reset_password'] - }, fields: [ 'uid', { @@ -271,7 +266,7 @@ return { label: '@i18n:actions.automember_rebuild' } ], - header_actions: ['enable', 'disable', 'delete', 'automember_rebuild'], + header_actions: ['reset_password', 'enable', 'disable', 'delete', 'automember_rebuild'], state: { evaluators: [ { diff --git a/ipatests/test_webui/test_user.py b/ipatests/test_webui/test_user.py index 8de0e82c8..766fdafb4 100644 --- a/ipatests/test_webui/test_user.py +++ b/ipatests/test_webui/test_user.py @@ -235,7 +235,7 @@ class test_user(UI_driver): Execute reset password action """ - self.action_panel_action('account_actions', 'reset_password') + self.action_list_action('reset_password', False) self.fill_password_dialog(password) def fill_password_dialog(self, password, current=None): |