incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1469155 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard.js ambari-web/app/controllers/wizard/step4_controller.js ambari-web/app/data/services.js
Date Thu, 18 Apr 2013 04:43:48 GMT
Author: yusaku
Date: Thu Apr 18 04:43:48 2013
New Revision: 1469155

URL: http://svn.apache.org/r1469155
Log:
AMBARI-1961. Select Services: clicking on "all" selects HUE even when HUE support is toggled
off. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
    incubator/ambari/trunk/ambari-web/app/data/services.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469155&r1=1469154&r2=1469155&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 04:43:48 2013
@@ -749,6 +749,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1961. Select Services: clicking on "all" selects HUE even when HUE
+ support is toggled off. (yusaku)
+
  AMBARI-1960. "Back" button can be pressed while host registration is taking
  process, even though the button seems disabled. (yusaku)
 

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1469155&r1=1469154&r2=1469155&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Thu Apr 18 04:43:48 2013
@@ -468,6 +468,7 @@ App.WizardController = Em.Controller.ext
           displayName: displayOrderConfig[i].displayName,
           isDisabled: i === 0,
           isSelected: displayOrderConfig[i].isSelected,
+          canBeSelected: displayOrderConfig[i].canBeSelected,
           isInstalled: false,
           isHidden: displayOrderConfig[i].isHidden,
           description: entry.comment,

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js?rev=1469155&r1=1469154&r2=1469155&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js Thu Apr 18
04:43:48 2013
@@ -31,7 +31,7 @@ App.WizardStep4Controller = Em.ArrayCont
    * Check whether all properties are selected
    */
   isAll: function () {
-    return this.everyProperty('isSelected', true);
+    return this.filterProperty('canBeSelected', true).everyProperty('isSelected', true);
   }.property('@each.isSelected'),
 
   /**
@@ -63,7 +63,7 @@ App.WizardStep4Controller = Em.ArrayCont
    * Onclick handler for <code>select all</code> link
    */
   selectAll: function () {
-    this.setEach('isSelected', true);
+    this.filterProperty('canBeSelected', true).setEach('isSelected', true);
   },
 
   /**

Modified: incubator/ambari/trunk/ambari-web/app/data/services.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/services.js?rev=1469155&r1=1469154&r2=1469155&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/services.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/services.js Thu Apr 18 04:43:48 2013
@@ -24,6 +24,7 @@ module.exports = [
     displayName: 'HDFS',
     isDisabled: true,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.hdfs.description')
   },
   {
@@ -31,6 +32,7 @@ module.exports = [
     displayName: 'MapReduce',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.mapreduce.description')
   },
   {
@@ -38,6 +40,7 @@ module.exports = [
     displayName: 'Nagios',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.nagios.description')
   },
   {
@@ -45,6 +48,7 @@ module.exports = [
     displayName: 'Ganglia',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.ganglia.description')
   },
   {
@@ -52,6 +56,7 @@ module.exports = [
     displayName: 'Hive + HCat + ZooKeeper',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.hive.description')
   },
   {
@@ -59,6 +64,7 @@ module.exports = [
     displayName: 'HCatalog',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     isHidden: true
   },
   {
@@ -66,6 +72,7 @@ module.exports = [
     displayName: 'WebHCat',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     isHidden: true
   },
   {
@@ -73,6 +80,7 @@ module.exports = [
     displayName: 'HBase + ZooKeeper',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.hbase.description')
   },
   {
@@ -80,6 +88,7 @@ module.exports = [
     displayName: 'Pig',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.pig.description')
   },
   {
@@ -87,6 +96,7 @@ module.exports = [
     displayName: 'Sqoop',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.sqoop.description')
   },
   {
@@ -94,6 +104,7 @@ module.exports = [
     displayName: 'Oozie',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     description: Em.I18n.t('services.oozie.description')
   },
   {
@@ -101,6 +112,7 @@ module.exports = [
 	  displayName: 'ZooKeeper',
     isDisabled: false,
     isSelected: true,
+    canBeSelected: true,
     isHidden: true
   },
   {
@@ -108,6 +120,7 @@ module.exports = [
     displayName: 'Hue',
     isDisabled: false,
     isSelected: App.supports.hue,
+    canBeSelected: App.supports.hue,
     isHidden: !App.supports.hue
   }
 ]
\ No newline at end of file



Mime
View raw message