diff options
author | Gabe <redhatrises@gmail.com> | 2015-05-05 06:33:27 -0600 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2015-05-07 10:38:26 +0200 |
commit | d1a0474d1851cd54a1fa7bdf4a0dc0ed452a0090 (patch) | |
tree | abc87d96218c11c22833f70a62f265374ddd7d36 /install/ui | |
parent | 37784625eba7d9f7f3cbd18483708a45ece3061e (diff) | |
download | freeipa-d1a0474d1851cd54a1fa7bdf4a0dc0ed452a0090.tar.gz freeipa-d1a0474d1851cd54a1fa7bdf4a0dc0ed452a0090.tar.xz freeipa-d1a0474d1851cd54a1fa7bdf4a0dc0ed452a0090.zip |
Unsaved changes dialog internally inconsistent
https://fedorahosted.org/freeipa/ticket/4926
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
Diffstat (limited to 'install/ui')
-rw-r--r-- | install/ui/src/freeipa/details.js | 30 | ||||
-rw-r--r-- | install/ui/src/freeipa/dns.js | 2 | ||||
-rw-r--r-- | install/ui/src/freeipa/ipa.js | 8 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 2 | ||||
-rwxr-xr-x | install/ui/util/make-ui.sh | 2 |
5 files changed, 23 insertions, 21 deletions
diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index 7aa4c0ef6..e428dc908 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -453,8 +453,8 @@ exp.facet_policies = IPA.facet_policies = function(spec) { * - sets name, title, label if not present * - adds default actions and related buttons * - refresh - * - reset - * - update + * - revert + * - save * - adds dirty state evaluator * * @member details @@ -472,21 +472,21 @@ exp.details_facet_pre_op = function(spec, context) { spec.actions = spec.actions || []; spec.actions.unshift( 'refresh', - 'reset', - 'update'); + 'revert', + 'save'); spec.control_buttons = spec.control_buttons || []; if (!spec.no_update) { spec.control_buttons.unshift( { - name: 'reset', - label: '@i18n:buttons.reset', + name: 'revert', + label: '@i18n:buttons.revert', icon: 'fa-undo' }, { - name: 'update', - label: '@i18n:buttons.update', + name: 'save', + label: '@i18n:buttons.save', icon: 'fa-upload' }); } @@ -1404,8 +1404,8 @@ exp.refresh_action = IPA.refresh_action = function(spec) { exp.reset_action = IPA.reset_action = function(spec) { spec = spec || {}; - spec.name = spec.name || 'reset'; - spec.label = spec.label || '@i18n:buttons.reset'; + spec.name = spec.name || 'revert'; + spec.label = spec.label || '@i18n:buttons.revert'; spec.enable_cond = spec.enable_cond || ['dirty']; var that = IPA.action(spec); @@ -1426,8 +1426,8 @@ exp.reset_action = IPA.reset_action = function(spec) { exp.update_action = IPA.update_action = function(spec) { spec = spec || {}; - spec.name = spec.name || 'update'; - spec.label = spec.label || '@i18n:buttons.update'; + spec.name = spec.name || 'save'; + spec.label = spec.label || '@i18n:buttons.save'; spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : false; spec.enable_cond = spec.enable_cond || ['dirty']; @@ -2007,8 +2007,8 @@ exp.register = function() { var f = reg.facet; a.register('refresh', exp.refresh_action); - a.register('reset', exp.reset_action); - a.register('update', exp.update_action); + a.register('revert', exp.reset_action); + a.register('save', exp.update_action); a.register('object', exp.object_action); a.register('enable', exp.enable_action); a.register('disable', exp.disable_action); @@ -2026,4 +2026,4 @@ exp.register = function() { phases.on('registration', exp.register); return exp; -});
\ No newline at end of file +}); diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 7b66c8674..8dce6a96d 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -1961,7 +1961,7 @@ IPA.dns.record_type_table_widget = function(spec) { dialog.create_button({ name: 'modify', - label: '@i18n:buttons.update', + label: '@i18n:buttons.save', click: function() { dialog.modify(); } diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index a78d1f063..836ad689b 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -754,8 +754,8 @@ IPA.dirty_dialog = function(spec) { }; that.create_button({ - name: 'update', - label: '@i18n:buttons.update', + name: 'save', + label: '@i18n:buttons.save', click: function() { that.facet.update(function() { that.close(); @@ -765,8 +765,8 @@ IPA.dirty_dialog = function(spec) { }); that.create_button({ - name: 'reset', - label: '@i18n:buttons.reset', + name: 'revert', + label: '@i18n:buttons.revert', click: function() { that.facet.reset(); that.close(); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 036543129..f969a874f 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -81,7 +81,9 @@ "reset_password_and_login": "Reset Password and Login", "restore": "Restore", "retry": "Retry", + "revert": "Revert", "revoke": "Revoke", + "save": "Save", "set": "Set", "unapply": "Un-apply", "update": "Update", diff --git a/install/ui/util/make-ui.sh b/install/ui/util/make-ui.sh index d842e955b..088fa8c3c 100755 --- a/install/ui/util/make-ui.sh +++ b/install/ui/util/make-ui.sh @@ -33,4 +33,4 @@ $DIR/build.sh webui # don't stop at error. Some dependency errors are expected. $DIR/compile.sh --release lib --layer freeipa/core --output $IPA_DIR/core.js $DIR/compile.sh --release lib --layer freeipa/app --output $IPA_DIR/app.js -$DIR/clean.sh
\ No newline at end of file +$DIR/clean.sh |