You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/09/05 14:24:21 UTC
git commit: AMBARI-7168 host group rename dialog shows warning on
load. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk d70f52b0e -> 057580fe2
AMBARI-7168 host group rename dialog shows warning on load. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/057580fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/057580fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/057580fe
Branch: refs/heads/trunk
Commit: 057580fe2f144c5496ec591c9c3a9774a1d5e965
Parents: d70f52b
Author: atkach <at...@hortonworks.com>
Authored: Fri Sep 5 15:21:39 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Fri Sep 5 15:21:39 2014 +0300
----------------------------------------------------------------------
.../controllers/main/service/manage_config_groups_controller.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/057580fe/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 151520c..53a11d7 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -374,7 +374,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
}),
configGroupName: self.get('selectedConfigGroup.name'),
configGroupDesc: self.get('selectedConfigGroup.description'),
- warningMessage: '',
+ warningMessage: null,
isDescriptionDirty: false,
validate: function () {
var warningMessage = '';
@@ -396,7 +396,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
this.set('warningMessage', warningMessage);
}.observes('configGroupName', 'configGroupDesc'),
disablePrimary: function () {
- return !(this.get('configGroupName').trim().length > 0 && !this.get('warningMessage'));
+ return !(this.get('configGroupName').trim().length > 0 && (this.get('warningMessage') !== null && !this.get('warningMessage')));
}.property('warningMessage', 'configGroupName', 'configGroupDesc'),
onPrimary: function () {
self.set('selectedConfigGroup.name', this.get('configGroupName'));
@@ -407,7 +407,6 @@ App.ManageConfigGroupsController = Em.Controller.extend({
this.hide();
}
});
- this.get('renameGroupPopup').validate();
},
/**