diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-04-14 16:44:03 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-10 10:23:26 +0200 |
commit | a98df325b6b0d7bf41509e8c8247a9422f179429 (patch) | |
tree | 488c57ede5c67b122aa01f0c5eb48dcb3625144f /install/ui/src | |
parent | be3aadd06ad2cdc434827e78e5227f34ecf63aa0 (diff) | |
download | freeipa-a98df325b6b0d7bf41509e8c8247a9422f179429.tar.gz freeipa-a98df325b6b0d7bf41509e8c8247a9422f179429.tar.xz freeipa-a98df325b6b0d7bf41509e8c8247a9422f179429.zip |
webui: add confirmation to action dropdown actions
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
Diffstat (limited to 'install/ui/src')
-rw-r--r-- | install/ui/src/freeipa/automember.js | 2 | ||||
-rw-r--r-- | install/ui/src/freeipa/details.js | 5 | ||||
-rw-r--r-- | install/ui/src/freeipa/group.js | 2 | ||||
-rw-r--r-- | install/ui/src/freeipa/otptoken.js | 4 |
4 files changed, 12 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js index 9182e1352..a16b3e1a1 100644 --- a/install/ui/src/freeipa/automember.js +++ b/install/ui/src/freeipa/automember.js @@ -708,6 +708,8 @@ IPA.automember.rebuild_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'automember_rebuild'; spec.label = spec.label || '@i18n:actions.automember_rebuild'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; + spec.confirm_msg = spec.confirm_msg || '@i18n:actions.automember_rebuild_confirm'; var that = IPA.action(spec); diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index 030c32395..b0d330466 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -1857,7 +1857,7 @@ exp.object_action = IPA.object_action = function(spec) { * @inheritDoc */ that.get_confirm_message = function(facet) { - var pkey = that.get_pkey(); + var pkey = facet.get_pkey(); var msg = that.confirm_msg.replace('${object}', pkey); return msg; }; @@ -1878,6 +1878,7 @@ exp.enable_action = IPA.enable_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'enable'; spec.method = spec.method || 'enable'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.confirm_msg = spec.confirm_msg || '@i18n:actions.enable_confirm'; spec.label = spec.label || '@i18n:buttons.enable'; spec.disable_cond = spec.disable_cond || ['enabled']; @@ -1898,6 +1899,7 @@ exp.disable_action = IPA.disable_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'disable'; spec.method = spec.method || 'disable'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.confirm_msg = spec.confirm_msg || '@i18n:actions.disable_confirm'; spec.label = spec.label || '@i18n:buttons.disable'; spec.enable_cond = spec.enable_cond || ['enabled']; @@ -1921,6 +1923,7 @@ exp.delete_action = IPA.delete_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'delete'; spec.method = spec.method || 'del'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.confirm_msg = spec.confirm_msg || '@i18n:actions.delete_confirm'; spec.label = spec.label || '@i18n:buttons.remove'; diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js index f13b810f5..f2103f8e8 100644 --- a/install/ui/src/freeipa/group.js +++ b/install/ui/src/freeipa/group.js @@ -240,6 +240,7 @@ IPA.group.make_posix_action = function(spec) { spec.name = spec.name || 'make_posix'; spec.method = spec.method || 'mod'; spec.label = spec.label || '@i18n:objects.group.make_posix'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.disable_cond = spec.disable_cond || ['oc_posixgroup', 'oc_ipaexternalgroup']; spec.options = spec.options || { posix: true @@ -256,6 +257,7 @@ IPA.group.make_external_action = function(spec) { spec.name = spec.name || 'make_external'; spec.method = spec.method || 'mod'; spec.label = spec.label || '@i18n:objects.group.make_external'; + spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.disable_cond = spec.disable_cond || ['oc_posixgroup','oc_ipaexternalgroup']; spec.options = spec.options || { external: true diff --git a/install/ui/src/freeipa/otptoken.js b/install/ui/src/freeipa/otptoken.js index a0c2cc1b3..d9771c190 100644 --- a/install/ui/src/freeipa/otptoken.js +++ b/install/ui/src/freeipa/otptoken.js @@ -129,6 +129,8 @@ return { name: 'otp_enable', label: '@i18n:objects.otptoken.enable', method: 'mod', + needs_confirm: true, + confirm_msg: '@i18n:actions.enable_confirm', options: { ipatokendisabled: false }, enable_cond: ['disabled'], hide_cond: ['self-service'] @@ -138,6 +140,8 @@ return { name: 'otp_disable', label: '@i18n:objects.otptoken.disable', method: 'mod', + needs_confirm: true, + confirm_msg: '@i18n:actions.disable_confirm', options: { ipatokendisabled: true }, enable_cond: ['enabled'], hide_cond: ['self-service'] |