svn commit: r1468269 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/config.js ambari-web/app/data/config_properties.js ambari-web/app/views/wizard/controls_view.js

[ja...@apache.org]

Author: jaimin
Date: Mon Apr 15 23:15:33 2013
New Revision: 1468269

URL: http://svn.apache.org/r1468269
Log:
AMBARI-1940. Create a flag to toggle the support for additional database support in Hive and Oozie. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/config.js
    incubator/ambari/trunk/ambari-web/app/data/config_properties.js
    incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1468269&r1=1468268&r2=1468269&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Apr 15 23:15:33 2013
@@ -258,6 +258,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1940. Create a flag to toggle the support for additional database 
+ support in Hive and Oozie. (jaimin)
+
  AMBARI-1928. Make experimental Ambari Web features toggleable
  via mvn build. (yusaku via jaimin)
  

Modified: incubator/ambari/trunk/ambari-web/app/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/config.js?rev=1468269&r1=1468268&r2=1468269&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/config.js Mon Apr 15 23:15:33 2013
@@ -46,7 +46,8 @@ App.supports = {
   reassignMaster: false,
   stackUpgrade: false,
   capacitySchedulerUi: false,
-  startStopAllServices: false
+  startStopAllServices: false,
+  hiveOozieExtraDatabases: false
 };
 
 if (App.enableExperimental) {

Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1468269&r1=1468268&r2=1468269&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Mon Apr 15 23:15:33 2013
@@ -849,7 +849,8 @@ module.exports =
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host']
+          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'],
+          hidden: !App.supports.hiveOozieExtraDatabases
         }
       ],
       "description": "MySQL will be installed by Ambari",
@@ -2262,15 +2263,18 @@ module.exports =
         },
         {
           displayName: 'New MySQL Database',
-          foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host']
+          foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'],
+          hidden: !App.supports.hiveOozieExtraDatabases
         },
         {
           displayName: 'Existing MySQL Database',
-          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host']
+          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'],
+          hidden: !App.supports.hiveOozieExtraDatabases
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host']
+          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'],
+          hidden: !App.supports.hiveOozieExtraDatabases
         }
       ],
       "description": "Current Derby Database will be installed by Ambari",

Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js?rev=1468269&r1=1468268&r2=1468269&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js Mon Apr 15 23:15:33 2013
@@ -169,11 +169,13 @@ App.ServiceConfigCheckbox = Ember.Checkb
 App.ServiceConfigRadioButtons = Ember.View.extend({
   template: Ember.Handlebars.compile([
     '{{#each option in view.options}}',
+    '{{#unless option.hidden}}',
     '<label class="radio">',
     '{{#view App.ServiceConfigRadioButton nameBinding = "view.name" valueBinding = "option.displayName"}}',
     '{{/view}}',
     '{{option.displayName}} &nbsp;',
     '</label>',
+    '{{/unless}}',
     '{{/each}}'
   ].join('\n')),
   serviceConfig: null,