Repository: ambari Updated Branches: refs/heads/trunk e2a1a5f8a -> 218bda793
AMBARI-16685 Kerberos page: Cancel clear config values. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/218bda79 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/218bda79 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/218bda79 Branch: refs/heads/trunk Commit: 218bda793b97b4affddc17e6e7b35ec9e79f0966 Parents: e2a1a5f Author: Andrii Tkach <[email protected]> Authored: Mon May 16 19:43:16 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Tue May 17 12:07:22 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/kerberos.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/218bda79/ambari-web/app/controllers/main/admin/kerberos.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js index a8383cc..e795bdf 100644 --- a/ambari-web/app/controllers/main/admin/kerberos.js +++ b/ambari-web/app/controllers/main/admin/kerberos.js @@ -524,6 +524,10 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({ this.makeConfigsUneditable(true); }, + /** + * @method makeConfigsUneditable + * @param configsUpdated + */ makeConfigsUneditable: function (configsUpdated) { this.set('isEditMode', false); this.get('stepConfigs').forEach(function (_stepConfig) { @@ -532,7 +536,7 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({ _config.set('savedValue', _config.get('value')); _config.set('defaultValue', _config.get('value')); } else { - _config.set('value', _config.get('savedValue')); + _config.set('value', _config.get('savedValue') || _config.get('defaultValue')); } _config.set('isEditable', false); });
