You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/09/02 02:51:22 UTC
ambari git commit: AMBARI-12965. Selection of SQLA should warn user
that it is supported only for HDP-2.3.2 and beyond. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5cbfb2a63 -> 30072598b
AMBARI-12965. Selection of SQLA should warn user that it is supported only for HDP-2.3.2 and beyond. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30072598
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30072598
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30072598
Branch: refs/heads/branch-2.1
Commit: 30072598bbe4d256d53ac61248125ae18f62cc6c
Parents: 5cbfb2a
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Sep 1 17:50:26 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Sep 1 17:51:18 2015 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/views/common/controls_view.js | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/30072598/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 9b81c66..35f72c7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1805,7 +1805,7 @@ 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.configGroup.name': 'Config Group Name',
'services.service.config.configHistory.rightArrow.tooltip': 'Show earlier versions',
http://git-wip-us.apache.org/repos/asf/ambari/blob/30072598/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 76171b3..ac2fa9a 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -690,7 +690,18 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
additionalView1 = shouldAdditionalViewsBeSet ? App.CheckDBConnectionView.extend({databaseName: dbType}) : null,
additionalView2 = shouldAdditionalViewsBeSet ? Ember.View.extend({
template: Ember.Handlebars.compile('<div class="alert">{{{view.message}}}</div>'),
- message: Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, driver)
+ 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;
+ }.property()
}) : null;
if (propertyAppendTo1) {
Em.run.next(function () {