ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [25/50] [abbrv] ambari git commit: AMBARI-13526 Validation popup on service config page shows properties not from current service. (ababiichuk)
Date Fri, 23 Oct 2015 14:47:39 GMT
AMBARI-13526 Validation popup on service config page shows properties not from current service.
(ababiichuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 3383f0245079865c353d5457a3ec6967fbdf1eac
Parents: a8445c9
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Oct 22 18:03:59 2015 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Oct 22 18:05:15 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/mixins/common/serverValidator.js             | 9 ++++++++-
 .../common/modal_popups/config_recommendation_popup.hbs     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3383f024/ambari-web/app/mixins/common/serverValidator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/serverValidator.js b/ambari-web/app/mixins/common/serverValidator.js
index 46c0b13..04c5882 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -437,7 +437,14 @@ App.ServerValidatorMixin = Em.Mixin.create({
         },
         bodyClass: Em.View.extend({
           controller: self,
-          templateName: require('templates/common/modal_popups/config_recommendation_popup')
+          templateName: require('templates/common/modal_popups/config_recommendation_popup'),
+          serviceConfigs: function() {
+            if (this.get('controller.name') === 'mainServiceInfoConfigsController') {
+              return [this.get('controller.selectedService')];
+            } else {
+              return this.get('controller.stepConfigs');
+            }
+          }.property()
         })
       });
     } else {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3383f024/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
index 5283417..c45e435 100644
--- a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
@@ -28,7 +28,7 @@
     </tr>
     </thead>
     <tbody>
-      {{#each service in stepConfigs}}
+      {{#each service in view.serviceConfigs}}
         {{#each property in service.configs}}
           {{#if property.warn}}
             <tr>


Mime
View raw message