Repository: ambari Updated Branches: refs/heads/branch-2.5 45067817c -> 2c3caa776
AMBARI-18389 - Config compare shows incorrect value after enabling kerberos (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c3caa77 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c3caa77 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c3caa77 Branch: refs/heads/branch-2.5 Commit: 2c3caa77687eb39eda8f4218973b344abbff3ca8 Parents: 4506781 Author: Richard Zang <rz...@apache.org> Authored: Wed Sep 14 13:50:08 2016 -0700 Committer: Richard Zang <rz...@apache.org> Committed: Wed Sep 14 14:48:14 2016 -0700 ---------------------------------------------------------------------- .../app/models/configs/objects/service_config_property.js | 9 +++++++-- .../models/configs/objects/service_config_property_test.js | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2c3caa77/ambari-web/app/models/configs/objects/service_config_property.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js index 265dd52..e7a2f52 100644 --- a/ambari-web/app/models/configs/objects/service_config_property.js +++ b/ambari-web/app/models/configs/objects/service_config_property.js @@ -111,8 +111,13 @@ App.ServiceConfigProperty = Em.Object.extend({ /** * Placeholder used for configs with input type text */ - placeholder: Em.computed.firstNotBlank('placeholderText', 'savedValue'), - + placeholder: function() { + if (this.isEditable) { + return this.get('placeholderText') || this.get('savedValue'); + } + return null; + }.property('isEditable', 'placeholderText', 'savedValue'), + retypedPassword: '', description: '', displayType: 'string', // string, digits, number, directories, custom http://git-wip-us.apache.org/repos/asf/ambari/blob/2c3caa77/ambari-web/test/models/configs/objects/service_config_property_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/configs/objects/service_config_property_test.js b/ambari-web/test/models/configs/objects/service_config_property_test.js index a6772d3..d462025 100644 --- a/ambari-web/test/models/configs/objects/service_config_property_test.js +++ b/ambari-web/test/models/configs/objects/service_config_property_test.js @@ -186,8 +186,6 @@ describe('App.ServiceConfigProperty', function () { serviceConfigProperty = getProperty(); }); - App.TestAliases.testAsComputedFirstNotBlank(getProperty(), 'placeholder', ['placeholderText', 'savedValue']); - App.TestAliases.testAsComputedAnd(getProperty(), 'hideFinalIcon', ['!isFinal', 'isNotEditable']); describe('#isPropertyOverridable', function () {
