You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/09/14 11:06:18 UTC
ambari git commit: AMBARI-13084 Ambari UI issues in SAPHD builds.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 0c77e3d23 -> 63dded51d
AMBARI-13084 Ambari UI issues in SAPHD builds. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63dded51
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63dded51
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63dded51
Branch: refs/heads/trunk
Commit: 63dded51d90d06f1ca7e55e6b756a5343c22659e
Parents: 0c77e3d
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Sep 14 12:04:33 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Sep 14 12:04:33 2015 +0300
----------------------------------------------------------------------
ambari-web/app/data/HDP2.3/site_properties.js | 3 ++-
ambari-web/app/data/HDP2/site_properties.js | 4 ++--
ambari-web/app/messages.js | 1 -
ambari-web/app/views/common/controls_view.js | 11 +----------
4 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/63dded51/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 54ac937..bc18cb9 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -82,7 +82,8 @@ hdp23properties.push({
displayName: 'MSSQL'
},
{
- displayName: 'SQLA'
+ displayName: 'SQLA',
+ hidden: App.get('currentStackName') !== 'SAPHD'
}
],
"displayType": "radio button",
http://git-wip-us.apache.org/repos/asf/ambari/blob/63dded51/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index e40d0b1..9a64742 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -611,7 +611,7 @@ var hdp2properties = [
},
{
displayName: 'Existing SQLA Database',
- hidden: !App.get('isHadoop23Stack')
+ hidden: App.get('currentStackName') !== 'SAPHD'
}
],
"displayType": "radio button",
@@ -811,7 +811,7 @@ var hdp2properties = [
},
{
displayName: 'Existing SQLA Database',
- hidden: !App.get('isHadoop23Stack')
+ hidden: App.get('currentStackName') !== 'SAPHD'
}
],
"displayType": "radio button",
http://git-wip-us.apache.org/repos/asf/ambari/blob/63dded51/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c54f492..e91d135 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1779,7 +1779,6 @@ Em.I18n.translations = {
'services.service.config.database.msg.jdbcSetup': 'Be sure you have run:<br/>' +
'<b>ambari-server setup --jdbc-db={0} --jdbc-driver=/path/to/{0}/{1}</b> ' +
'on the Ambari Server host to make the JDBC driver available and to enable testing the database connection.',
- 'stack.specific.sqla.support.msg': '<b>Please note that SQLA database option is only supported on HDP-2.3.2 or higher.</b><br/>',
'services.service.config.configHistory.configGroup': 'Config Group',
'services.service.config.configHistory.rightArrow.tooltip': 'Show earlier versions',
'services.service.config.configHistory.leftArrow.tooltip': 'Show later versions',
http://git-wip-us.apache.org/repos/asf/ambari/blob/63dded51/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 672ca16..d68314c 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -682,16 +682,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
additionalView2 = shouldAdditionalViewsBeSet ? Ember.View.extend({
template: Ember.Handlebars.compile('<div class="alert">{{{view.message}}}</div>'),
message: function() {
- var message;
- var jdbcDriverSetupMsg = Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, driver);
- var isWizardPage = ['addServiceController', 'installerController'].contains(this.get('controller.wizardController.name'));
- if (currentDBType === 'SQLA' && isWizardPage) {
- var sqlaDbSupportMsg = Em.I18n.t('stack.specific.sqla.support.msg');
- message = sqlaDbSupportMsg + jdbcDriverSetupMsg;
- } else {
- message = jdbcDriverSetupMsg;
- }
- return message;
+ return Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, driver);
}.property()
}) : null;
if (propertyAppendTo1) {