You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/06/14 15:04:56 UTC
ambari git commit: AMBARI-11906. Install Wizard: Moving from review
step to customize services page cause js error. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e7a4ce323 -> aea31f740
AMBARI-11906. Install Wizard: Moving from review step to customize services page cause js error. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aea31f74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aea31f74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aea31f74
Branch: refs/heads/trunk
Commit: aea31f7407c135d41842b02c86218ad8ed8a9e69
Parents: e7a4ce3
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sun Jun 14 01:24:57 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sun Jun 14 16:03:45 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aea31f74/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 d20cee5..3cf8f56 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -677,12 +677,14 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
var self = this;
this.loadServerSideConfigsRecommendations().always(function () {
// format descriptor configs
- var serviceConfigProperties = (self.get('content.serviceConfigProperties') || []).mapProperty('name');
- var recommendedToDelete = self.get('_dependentConfigValues').filterProperty('toDelete');
+ var serviceConfigPropertiesNames = (self.get('content.serviceConfigProperties') || []).mapProperty('name'),
+ serviceConfigPropertiesFileNames = (self.get('content.serviceConfigProperties') || []).mapProperty('filename'),
+ recommendedToDelete = self.get('_dependentConfigValues').filterProperty('toDelete');
recommendedToDelete.forEach(function (c) {
- var name = Em.get(c, 'propertyName');
- if (serviceConfigProperties.contains(name)) {
- Em.set(self.get('_dependentConfigValues').findProperty('propertyName', name).findProperty('fileName', serviceConfigProperties.get('filename')), 'toDelete', false);
+ var name = Em.get(c, 'propertyName'),
+ filename = Em.get(c, 'fileName');
+ if (serviceConfigPropertiesNames.contains(name) && serviceConfigPropertiesFileNames.contains(filename)) {
+ Em.set(c, 'toDelete', false);
}
});