Updated Branches: refs/heads/branch-1.2.5 a490e39cc -> a46d35bf7
AMBARI-2761. Customize Services page - Misc tab: incorrect behavior of popup window for changing user names. (Antonenko Alexander via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/a46d35bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/a46d35bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/a46d35bf Branch: refs/heads/branch-1.2.5 Commit: a46d35bf70d8e90f9ddb405bf716b84266ffdee1 Parents: a490e39 Author: Yusaku Sako <[email protected]> Authored: Mon Jul 29 14:18:03 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Mon Jul 29 14:18:03 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 6 ++++-- ambari-web/app/views/common/configs/services_config.js | 11 +++++------ 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a46d35bf/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 b7cd34d..f7e778c 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -40,9 +40,11 @@ App.WizardStep7Controller = Em.Controller.extend({ secureConfigs: require('data/secure_mapping'), + miscModalVisible: false, //If miscConfigChange Modal is shown + isSubmitDisabled: function () { - return !this.stepConfigs.filterProperty('showConfig', true).everyProperty('errorCount', 0); - }.property('[email protected]'), + return (!this.stepConfigs.filterProperty('showConfig', true).everyProperty('errorCount', 0) || this.get("miscModalVisible")); + }.property('[email protected]', 'miscModalVisible'), selectedServiceNames: function () { return this.get('content.services').filterProperty('isSelected', true).filterProperty('isInstalled', false).mapProperty('serviceName'); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a46d35bf/ambari-web/app/views/common/configs/services_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js index 27b5fbe..711e158 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -52,7 +52,6 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ classNameBindings: ['category.name', 'isShowBlock::hidden'], content: null, - miscModalVisible: false, //If miscConfigChange Modal is shown category: null, service: null, canEdit: true, // View is editable or read-only? @@ -181,7 +180,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ ); } } - if (this.affectedProperties.length > 0 && !this.get("miscModalVisible")) { + if (this.affectedProperties.length > 0 && !this.get("controller.miscModalVisible")) { this.newAffectedProperties = this.affectedProperties; var self = this; return App.ModalPopup.show({ @@ -193,18 +192,18 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ self.get("controller.stepConfigs").findProperty("serviceName", item.serviceName).get("configs") .findProperty("name", item.propertyName).set("value", item.newValue); }); - self.set("miscModalVisible", false); + self.get("controller").set("miscModalVisible", false); this.hide(); }, onIgnore: function () { - self.set("miscModalVisible", false); + self.get("controller").set("miscModalVisible", false); this.hide(); }, onUndo: function () { var affected = self.get("newAffectedProperties").objectAt(0); self.get("controller.stepConfigs").findProperty("serviceName", "MISC").get("configs") .findProperty("name", affected.changedPropertyName).set("value", $.trim(affected.curValue)); - self.set("miscModalVisible", false); + self.get("controller").set("miscModalVisible", false); this.hide(); }, footerClass: Ember.View.extend({ @@ -222,7 +221,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ controller: this, propertyChange: self.get("newAffectedProperties"), didInsertElement: function () { - self.set("miscModalVisible", true); + self.get("controller").set("miscModalVisible", true); } }) });
