AMBARI-1848. Install Wizard, Step 7: Oozie Database Derby option should say "New Derby Database", not "Current Derby Database". (Xi Wang via srimanth)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1466227 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -668,6 +668,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1848. Install Wizard, Step 7: Oozie Database Derby option should say 
+ "New Derby Database", not "Current Derby Database". (Xi Wang via srimanth)
+
  AMBARI-1860. Master broken - Cannot deploy services. (smohanty)
 
  AMBARI-1859. Cannot load Nagios Alerts due to 400 Bad Request. (smohanty)

ambari-web/app/controllers/main/service/info/configs.js

@@ -769,7 +769,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   setOozieHostName: function (globals) {
     if (globals.someProperty('name', 'oozie_database')) {
       var oozieDb = globals.findProperty('name', 'oozie_database');
-      if (oozieDb.value === 'Current Derby Database'){
+      if (oozieDb.value === 'New Derby Database'){
         globals = globals.without(globals.findProperty('name', 'oozie_ambari_host'));
         globals = globals.without(globals.findProperty('name', 'oozie_ambari_database'));
         globals = globals.without(globals.findProperty('name', 'oozie_existing_mysql_host'));

ambari-web/app/controllers/wizard/step8_controller.js

@@ -120,7 +120,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       var oozieJdbcDriver = {name: 'oozie_jdbc_driver'};
       var oozieJPAServcieURL = {name: 'oozie_JPAService_url'};
 
-      if (oozieDb.value === 'Current Derby Database'){
+      if (oozieDb.value === 'New Derby Database'){
         oozieDbType.value = 'derby';
         oozieJdbcDriver.value = 'org.apache.derby.jdbc.EmbeddedDriver';
         oozieJPAServcieURL.value = '${oozie.data.dir}/${oozie.db.schema.name}-db;create=true';  ///////
@@ -699,7 +699,7 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   loadOozieDbValue: function (dbComponent) {
     var oozieDb = App.db.getServiceConfigProperties().findProperty('name', 'oozie_database');
-    if (oozieDb.value === 'Current Derby Database'){
+    if (oozieDb.value === 'New Derby Database'){
       var db = App.db.getServiceConfigProperties().findProperty('name', 'oozie_derby_database');
       dbComponent.set('component_value', db.value + ' (' + oozieDb.value + ')');
     } else if (oozieDb.value === 'New MySQL Database') {

ambari-web/app/data/config_properties.js

@@ -2254,10 +2254,10 @@ module.exports =
       "name": "oozie_database",
       "displayName": "Oozie Database",
       "value": "",
-      "defaultValue": "Current Derby Database",
+      "defaultValue": "New Derby Database",
       "options": [
         {
-          displayName: 'Current Derby Database',
+          displayName: 'New Derby Database',
           foreignKeys: ['oozie_derby_database']
         },
         {

ambari-web/app/mappers/dataset_mapper.js

@@ -178,8 +178,6 @@ App.dataSetMapper = App.QuickDataMapper.create({
         }
       }, this);
 
-
-      debugger;
       console.debug('Before load: App.Dataset.find().content : ' + App.Dataset.find().content);
       App.store.loadMany(this.get('model'), dataset_results);
       console.debug('After load: App.Dataset.find().content : ' + App.Dataset.find().content);