Repository: ambari Updated Branches: refs/heads/branch-2.1 63691daa6 -> 537249938
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/53724993 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53724993 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53724993 Branch: refs/heads/branch-2.1 Commit: 537249938e1e1d1cb4485f31e1d870c84126ed45 Parents: 63691da Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Mon Sep 14 12:04:33 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Mon Sep 14 12:10:39 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/53724993/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 5a25ecb..9b8241f 100644 --- a/ambari-web/app/data/HDP2.3/site_properties.js +++ b/ambari-web/app/data/HDP2.3/site_properties.js @@ -87,7 +87,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/53724993/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 a3b9451..f2c80cb 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -3392,7 +3392,7 @@ var hdp2properties = [ }, { displayName: 'Existing SQLA Database', - hidden: !App.get('isHadoop23Stack') + hidden: App.get('currentStackName') !== 'SAPHD' } ], "description": "MySQL will be installed by Ambari", @@ -3635,7 +3635,7 @@ var hdp2properties = [ }, { displayName: 'Existing SQLA Database', - hidden: !App.get('isHadoop23Stack') + hidden: App.get('currentStackName') !== 'SAPHD' } ], "description": "Current Derby Database will be installed by Ambari", http://git-wip-us.apache.org/repos/asf/ambari/blob/53724993/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 6f813c9..6d5629f 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1805,7 +1805,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/53724993/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 769e631..758e0af 100644 --- a/ambari-web/app/views/common/controls_view.js +++ b/ambari-web/app/views/common/controls_view.js @@ -681,16 +681,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) {
