ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-9199 Configs: broken configs flow after discarding recommendations. (atkach)
Date Mon, 19 Jan 2015 18:19:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ba98455cc -> 88094f6ba


AMBARI-9199 Configs: broken configs flow after discarding recommendations. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88094f6b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88094f6b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88094f6b

Branch: refs/heads/trunk
Commit: 88094f6ba4ef536f2431e55b9a2f07a36c04c935
Parents: ba98455
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Mon Jan 19 18:48:36 2015 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Mon Jan 19 20:19:43 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js    | 1 +
 ambari-web/app/views/common/configs/config_history_flow.js | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/88094f6b/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 94aed77..e38b7e3 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -2366,6 +2366,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
    * @method loadStep
    */
   doCancel: function () {
+    this.set('preSelectedConfigVersion', null);
     Em.run.once(this, 'onConfigGroupChange');
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/88094f6b/ambari-web/app/views/common/configs/config_history_flow.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js
index 9253471..7c55fca 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -500,6 +500,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
       },
       onDiscard: function () {
         this.hide();
+        self.set('controller.preSelectedConfigVersion', null);
         self.get('controller').loadStep();
       },
       onCancel: function () {


Mime
View raw message