From 35d3f03843536613b6fdb4e0cf07c44f5d8b5140 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Tue, 24 Jun 2014 12:24:23 +0200
Subject: [PATCH] webui: support unlock user command

Call user-unlock command from Web UI.

It will unlock displayed user on current master.

https://fedorahosted.org/freeipa/ticket/4407

Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
---
 install/ui/src/freeipa/user.js     | 10 +++++++++-
 install/ui/test/data/ipa_init.json |  4 +++-
 ipalib/plugins/internal.py         |  2 ++
 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
@@ -269,13 +269,21 @@ return {
                 'disable',
                 '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)