Repository: ambari Updated Branches: refs/heads/branch-windows-dev b0e3eb9d7 -> 4919fd56e
AMBARI-8085. Remove hardcoded Windows specific logic from ambari-web. (jayush via jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4919fd56 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4919fd56 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4919fd56 Branch: refs/heads/branch-windows-dev Commit: 4919fd56e2be82832a3a8f59094067fb48cd3acc Parents: b0e3eb9 Author: Jaimin Jetly <[email protected]> Authored: Tue Nov 4 14:43:21 2014 -0800 Committer: Jaimin Jetly <[email protected]> Committed: Tue Nov 4 14:43:27 2014 -0800 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 10 +++--- ambari-web/app/controllers/wizard.js | 2 +- .../app/controllers/wizard/step1_controller.js | 2 +- ambari-web/app/data/HDP2/site_properties.js | 12 ++++--- ambari-web/app/templates/wizard/step1.hbs | 36 ++++++++++---------- 5 files changed, 34 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4919fd56/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index c9ec483..bc5406d 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -2575,10 +2575,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM configs.findProperty('name', 'oozie_hostname').isVisible = true; } } - if (serviceName === 'HDFS') { - var sinkDB = configs.findProperty('name', 'sink_database').value; - if (['Existing MSSQL Server database with integrated authentication', 'Existing MSSQL Server database with sql auth'].contains(sinkDB)) { - configs.findProperty('name', 'sink.dbservername').isVisible = true; + if(App.get('isHadoopWindowsStack')) { + if (serviceName === 'HDFS') { + var sinkDB = configs.findProperty('name', 'sink_database').value; + if (['Existing MSSQL Server database with integrated authentication', 'Existing MSSQL Server database with sql auth'].contains(sinkDB)) { + configs.findProperty('name', 'sink.dbservername').isVisible = true; + } } } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/4919fd56/ambari-web/app/controllers/wizard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js index 73e6e2c..8abd337 100644 --- a/ambari-web/app/controllers/wizard.js +++ b/ambari-web/app/controllers/wizard.js @@ -526,7 +526,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, { localRepo: false, //true, false sshKey: "", //string bootRequestId: null, //string - sshUser: "root" //string + sshUser: "" //string }, loadedServiceComponents: null, http://git-wip-us.apache.org/repos/asf/ambari/blob/4919fd56/ambari-web/app/controllers/wizard/step1_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step1_controller.js b/ambari-web/app/controllers/wizard/step1_controller.js index 0d1ab1e..34e121e 100644 --- a/ambari-web/app/controllers/wizard/step1_controller.js +++ b/ambari-web/app/controllers/wizard/step1_controller.js @@ -25,7 +25,7 @@ App.WizardStep1Controller = Em.Controller.extend({ * Skip repo-validation * @type {bool} */ - skipValidationChecked: true, + skipValidationChecked: false, selectedStack: function() { return App.Stack.find().findProperty('isSelected'); http://git-wip-us.apache.org/repos/asf/ambari/blob/4919fd56/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 7485c5a..9bc61a9 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -2744,11 +2744,13 @@ module.exports = }, { displayName: 'Existing MSSQL Server database with integrated authentication', - foreignKeys: ['hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'] + foreignKeys: ['hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'], + hidden: !App.get('isHadoopWindowsStack') }, { displayName: 'Existing MSSQL Server database with sql auth', - foreignKeys: ['hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'] + foreignKeys: ['hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'], + hidden: !App.get('isHadoopWindowsStack') } ], "description": "MySQL will be installed by Ambari", @@ -3184,11 +3186,13 @@ module.exports = }, { displayName: 'Existing MSSQL Server database with integrated authentication', - foreignKeys: ['oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'] + foreignKeys: ['oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'], + hidden: !App.get('isHadoopWindowsStack') }, { displayName: 'Existing MSSQL Server database with sql auth', - foreignKeys: ['oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'] + foreignKeys: ['oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'], + hidden: !App.get('isHadoopWindowsStack') } ], "description": "Current Derby Database will be installed by Ambari", http://git-wip-us.apache.org/repos/asf/ambari/blob/4919fd56/ambari-web/app/templates/wizard/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs index cae6e5d..5905c7c 100644 --- a/ambari-web/app/templates/wizard/step1.hbs +++ b/ambari-web/app/templates/wizard/step1.hbs @@ -93,27 +93,27 @@ {{/each}} </div> </div> - <!--<div id="skip-validation">--> - <!--<label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}--> - <!--<i class="icon-question-sign" rel="skip-validation-tooltip"--> - <!--data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>--> - <!--</div>--> - {{#if view.emptyRepoExist}} - <div class="alert">{{t installer.step1.attentionNeeded}}</div> - {{/if}} - {{#if view.invalidUrlExist}} - <div class="alert"> - {{t installer.step1.invalidURLAttention}} - <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a> - </div> - {{/if}} - {{#if view.allRepoUnchecked}} - <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div> - {{/if}} - </div> + <div id="skip-validation"> + <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}} + <i class="icon-question-sign" rel="skip-validation-tooltip" + data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label> + </div> + {{#if view.emptyRepoExist}} + <div class="alert">{{t installer.step1.attentionNeeded}}</div> + {{/if}} + {{#if view.invalidUrlExist}} + <div class="alert"> + {{t installer.step1.invalidURLAttention}} + <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a> + </div> + {{/if}} + {{#if view.allRepoUnchecked}} + <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div> + {{/if}} </div> </div> </div> +</div> {{/if}} <a class="btn pull-left" {{action back}}>← {{t common.back}}</a>
