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/24 13:23:41 UTC
git commit: AMBARI-7468 'Warning' window appearing when manually
navigating from config tab with already saved configs. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 1977a1254 -> 10b0038c4
AMBARI-7468 'Warning' window appearing when manually navigating from config tab with already saved configs. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10b0038c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10b0038c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10b0038c
Branch: refs/heads/trunk
Commit: 10b0038c48f90b86a3b04984cb6471dd0d1159dc
Parents: 1977a12
Author: atkach <at...@hortonworks.com>
Authored: Wed Sep 24 14:21:48 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Wed Sep 24 14:21:48 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/10b0038c/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 2267b98..a05f5ac 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1451,21 +1451,23 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
*/
showSaveConfigsPopup: function (header, flag, message, messageClass, value, status, urlParams) {
var self = this;
+ if (flag) {
+ this.set('forceTransition', flag);
+ self.loadStep();
+ }
App.ModalPopup.show({
header: header,
primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function () {
this.hide();
- if (flag) {
- self.loadStep();
- } else {
- self.set('isApplyingChanges', false)
+ if (!flag) {
+ self.set('isApplyingChanges', false);
}
},
onClose: function () {
this.hide();
- self.set('isApplyingChanges', false)
+ self.set('isApplyingChanges', false);
},
disablePrimary: true,
bodyClass: Ember.View.extend({