svn commit: r1469635 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/utils/config.js

[yu...@apache.org]

Author: yusaku
Date: Thu Apr 18 23:38:43 2013
New Revision: 1469635

URL: http://svn.apache.org/r1469635
Log:
AMBARI-1986. HDFS General section has disappeared from Customize Services step of the Install Wizard. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/utils/config.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469635&r1=1469634&r2=1469635&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 23:38:43 2013
@@ -765,6 +765,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1986. HDFS General section has disappeared from Customize Services 
+ step of the Install Wizard. (yusaku)
+
  AMBARI-1985. Incorrect behavior of "Undo" button for password fields. (yusaku)
 
  AMBARI-1702. Ambari/GSInstallers need to set the value of 

Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1469635&r1=1469634&r2=1469635&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Thu Apr 18 23:38:43 2013
@@ -199,15 +199,11 @@ App.config = Em.Object.create({
       var stored = storedConfigs.findProperty('name', name);
       var preDefined = preDefinedConfigs.findProperty('name', name);
       var configData = {};
-      var configCategory = 'Advanced';
       var isAdvanced = advancedConfigs.someProperty('name', name);
       if (preDefined && stored) {
         configData = preDefined;
         configData.value = stored.value;
         configData.overrides = stored.overrides;
-        if (isAdvanced) {
-          configData.category = (configData.category === undefined) ? configCategory : configData.category;
-        }
       } else if (!preDefined && stored) {
         configData = {
           id: stored.id,
@@ -218,10 +214,11 @@ App.config = Em.Object.create({
           defaultValue: stored.defaultValue,
           displayType: "advanced",
           filename: stored.filename,
-          category: configCategory,
+          category: 'Advanced',
           isUserProperty: stored.isUserProperty === true,
           isOverridable: true,
-          overrides: stored.overrides
+          overrides: stored.overrides,
+          isRequired: !isAdvanced
         }
         if (!isAdvanced || this.get('customFileNames').contains(configData.filename)) {
           var categoryMetaData = this.identifyCategory(configData);
@@ -233,7 +230,6 @@ App.config = Em.Object.create({
       } else if (preDefined && !stored) {
         configData = preDefined;
         if (isAdvanced) {
-          configData.category = (configData.category === undefined) ? configCategory : configData.category;
           configData.filename = advancedConfigs.findProperty('name', configData.name).filename;
         }
       }