AMBARI-13084 Ambari UI issues in SAPHD builds. (ababiichuk)

4 files changed, 5 insertions, 14 deletions

diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 54ac937481..bc18cb9b17 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",
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index e40d0b1c88..9a64742faf 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",
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c54f49227a..e91d135d56 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',
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 672ca16ca4..d68314caf6 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) {