ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-7014 FE: Add service wizard not sending configs of added service for validations
Date Tue, 26 Aug 2014 13:51:04 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 40f1c4e8f -> db83ea24c


AMBARI-7014 FE: Add service wizard not sending configs of added service for validations


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

Branch: refs/heads/trunk
Commit: db83ea24ce47d84895c699137c6c2a9ade2f3577
Parents: 40f1c4e
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Tue Aug 26 16:49:06 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Aug 26 16:49:06 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/mixins/common/serverValidator.js | 2 +-
 ambari-web/app/models/stack_service.js          | 3 ---
 ambari-web/app/utils/config.js                  | 2 +-
 ambari-web/test/utils/blueprint_test.js         | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/db83ea24/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 5140224..462ff62 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -78,7 +78,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
     return this.get('content.serviceName')
         ? [App.StackService.find(this.get('content.serviceName'))]
         : App.StackService.find().filter(function(s){
-          return s.get('allowServerValidator') && (s.get('isSelected') || s.get('isInsalled'))
+          return (s.get('isSelected') || s.get('isInstalled'))
         }).concat(require("data/service_configs"));
   }.property('content.serviceName'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/db83ea24/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 744083b..e19e27f 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -171,9 +171,6 @@ App.StackService = DS.Model.extend(App.ServiceModelMixin, {
     return defaultConfigsHandler && defaultConfigsHandler.configsValidator;
   }.property('serviceName'),
 
-  allowServerValidator: function() {
-    return ["YARN", "STORM", "MAPREDUCE2", "HIVE", "TEZ"].contains(this.get('serviceName'));
-  }.property('serviceName'),
   /**
    * configCategories are fetched from  App.StackService.configCategories.
    * Also configCategories that does not match any serviceComponent of a service and not
included in the permissible default pattern are omitted

http://git-wip-us.apache.org/repos/asf/ambari/blob/db83ea24/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 62db148..03bd079 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -691,7 +691,7 @@ App.config = Em.Object.create({
       // Use calculated default values for some configs
       var recommendedDefaults = {};
       if (App.get('supports.serverRecommendValidate')) {
-        if (!storedConfigs && service.get('configTypes') && service.get('allowServerValidator'))
{
+        if (!storedConfigs && service.get('configTypes')) {
           Object.keys(service.get('configTypes')).forEach(function (type) {
             if (!recommended || !recommended[type]) {
               return;

http://git-wip-us.apache.org/repos/asf/ambari/blob/db83ea24/ambari-web/test/utils/blueprint_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/blueprint_test.js b/ambari-web/test/utils/blueprint_test.js
index 1f8d803..d615896 100644
--- a/ambari-web/test/utils/blueprint_test.js
+++ b/ambari-web/test/utils/blueprint_test.js
@@ -287,7 +287,6 @@ describe('utils/blueprint', function() {
               "yarn-site": {},
               "yarn-env": {}
             },
-            allowServerValidator: true,
             isInstalled: true
           })
         ],


Mime
View raw message