Repository: ambari Updated Branches: refs/heads/trunk a709f6078 -> c6d15394a
AMBARI-17575. Refresh YARN queue is not happening when HSI is enabled at cluster install time.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6d15394 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6d15394 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6d15394 Branch: refs/heads/trunk Commit: c6d15394a3a5b8405e4ad212e7d1a3764994e236 Parents: a709f60 Author: Xi Wang <xiw...@apache.org> Authored: Tue Jul 5 17:48:41 2016 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Tue Jul 5 18:18:51 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 5 ++++- ambari-web/app/messages.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c6d15394/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 7f9c17e..aac869d 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -553,9 +553,12 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E var config = configs.filterProperty('filename', fileName).findProperty('name', configName); if (config) { var isServiceInstalled = App.Service.find().findProperty('serviceName', config.serviceName); - if (isServiceInstalled) { + // service already installed or is being added in add service wizard + if (isServiceInstalled || stepConfigs.someProperty("serviceName", config.serviceName)) { var serviceConfigs = stepConfigs.findProperty('serviceName', config.serviceName).get('configs'); var serviceConfig = serviceConfigs.filterProperty('filename', fileName).findProperty('name', configName); + var notEditableText = " " + Em.I18n.t('installer.step7.addWizard.notEditable'); + serviceConfig.set('description', serviceConfig.get('description') + notEditableText); serviceConfig.set('isReconfigurable', false); config.isReconfigurable = false; } http://git-wip-us.apache.org/repos/asf/ambari/blob/c6d15394/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index dcf0426..888aa52 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -899,6 +899,7 @@ Em.I18n.translations = { 'installer.step7.oozie.database.new': 'New Derby Database', 'installer.step7.hive.database.new.mysql': 'New MySQL Database', 'installer.step7.hive.database.new.postgres': 'New PostgreSQL Database', + 'installer.step7.addWizard.notEditable': 'This configuration cannot be edited on Add Service wizard', 'installer.step7.misc.notification.configure':'Configure email notifications', 'installer.step7.misc.notification.configure.later':'Configure email notifications later', 'installer.step7.misc.notification.use_tls':'Use TLS',
