You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/02 00:08:55 UTC
svn commit: r1478215 [1/3] - in /incubator/ambari/trunk/ambari-web/app:
assets/img/ controllers/main/service/info/ data/ models/ utils/
views/common/configs/
Author: yusaku
Date: Wed May 1 22:08:55 2013
New Revision: 1478215
URL: http://svn.apache.org/r1478215
Log:
Committing missed files. (yusaku)
Added:
incubator/ambari/trunk/ambari-web/app/assets/img/logo.png (with props)
Removed:
incubator/ambari/trunk/ambari-web/app/assets/img/logo-small-gold.png
incubator/ambari/trunk/ambari-web/app/assets/img/logo-small-yellow.png
incubator/ambari/trunk/ambari-web/app/assets/img/logo-small.png
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
incubator/ambari/trunk/ambari-web/app/models/service_config.js
incubator/ambari/trunk/ambari-web/app/utils/config.js
incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
Added: incubator/ambari/trunk/ambari-web/app/assets/img/logo.png
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/img/logo.png?rev=1478215&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ambari/trunk/ambari-web/app/assets/img/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1478215&r1=1478214&r2=1478215&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js Wed May 1 22:08:55 2013
@@ -821,21 +821,28 @@ App.MainServiceInfoConfigsController = E
if (globals.someProperty('name', 'hive_database')) {
var hiveDb = globals.findProperty('name', 'hive_database');
if (hiveDb.value === 'New MySQL Database') {
- if (globals.someProperty('name', 'hive_ambari_host')) {
- globals.findProperty('name', 'hive_ambari_host').name = 'hive_hostname';
+ var ambariHost = globals.findProperty('name', 'hive_ambari_host');
+ if (ambariHost) {
+ ambariHost.name = 'hive_hostname';
}
globals = globals.without(globals.findProperty('name', 'hive_existing_mysql_host'));
globals = globals.without(globals.findProperty('name', 'hive_existing_mysql_database'));
globals = globals.without(globals.findProperty('name', 'hive_existing_oracle_host'));
globals = globals.without(globals.findProperty('name', 'hive_existing_oracle_database'));
} else if (hiveDb.value === 'Existing MySQL Database'){
- globals.findProperty('name', 'hive_existing_mysql_host').name = 'hive_hostname';
+ var existingMySqlHost = globals.findProperty('name', 'hive_existing_mysql_host');
+ if (existingMySqlHost) {
+ existingMySqlHost.name = 'hive_hostname';
+ }
globals = globals.without(globals.findProperty('name', 'hive_ambari_host'));
globals = globals.without(globals.findProperty('name', 'hive_ambari_database'));
globals = globals.without(globals.findProperty('name', 'hive_existing_oracle_host'));
globals = globals.without(globals.findProperty('name', 'hive_existing_oracle_database'));
- } else{ //existing oracle database
- globals.findProperty('name', 'hive_existing_oracle_host').name = 'hive_hostname';
+ } else { //existing oracle database
+ var existingOracleHost = globals.findProperty('name', 'hive_existing_oracle_host');
+ if (existingOracleHost) {
+ existingOracleHost.name = 'hive_hostname';
+ }
globals = globals.without(globals.findProperty('name', 'hive_ambari_host'));
globals = globals.without(globals.findProperty('name', 'hive_ambari_database'));
globals = globals.without(globals.findProperty('name', 'hive_existing_mysql_host'));
@@ -846,7 +853,7 @@ App.MainServiceInfoConfigsController = E
},
/**
- * set hive hostnames in global configs
+ * set oozie hostnames in global configs
* @param globals
*/
setOozieHostName: function (globals) {
@@ -860,8 +867,9 @@ App.MainServiceInfoConfigsController = E
globals = globals.without(globals.findProperty('name', 'oozie_existing_oracle_host'));
globals = globals.without(globals.findProperty('name', 'oozie_existing_oracle_database'));
} else if (oozieDb.value === 'New MySQL Database') {
- if (globals.someProperty('name', 'oozie_ambari_host')) {
- globals.findProperty('name', 'oozie_ambari_host').name = 'oozie_hostname';
+ var ambariHost = globals.findProperty('name', 'oozie_ambari_host');
+ if (ambariHost) {
+ ambariHost.name = 'oozie_hostname';
}
globals = globals.without(globals.findProperty('name', 'oozie_existing_mysql_host'));
globals = globals.without(globals.findProperty('name', 'oozie_existing_mysql_database'));
@@ -869,16 +877,21 @@ App.MainServiceInfoConfigsController = E
globals = globals.without(globals.findProperty('name', 'oozie_existing_oracle_database'));
globals = globals.without(globals.findProperty('name', 'oozie_derby_database'));
- } else if (oozieDb.value === 'Existing MySQL Database'){
-
- globals.findProperty('name', 'oozie_existing_mysql_host').name = 'oozie_hostname';
+ } else if (oozieDb.value === 'Existing MySQL Database') {
+ var existingMySqlHost = globals.findProperty('name', 'oozie_existing_mysql_host');
+ if (existingMySqlHost) {
+ existingMySqlHost.name = 'oozie_hostname';
+ }
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_oracle_host'));
globals = globals.without(globals.findProperty('name', 'oozie_existing_oracle_database'));
globals = globals.without(globals.findProperty('name', 'oozie_derby_database'));
} else{ //existing oracle database
- globals.findProperty('name', 'oozie_existing_oracle_host').name = 'oozie_hostname';
+ var existingOracleHost = globals.findProperty('name', 'oozie_existing_oracle_host');
+ if (existingOracleHost) {
+ existingOracleHost.name = 'oozie_hostname';
+ }
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'));