Repository: ambari Updated Branches: refs/heads/trunk c94780aa3 -> e6b3972f4
AMBARI-11081. Kerberos: cannot get passed "Install and Test Kerberos Client" step (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6b3972f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6b3972f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6b3972f Branch: refs/heads/trunk Commit: e6b3972f4dc28cae594c8c5719c84986e8044e30 Parents: bcfffdb Author: Alex Antonenko <[email protected]> Authored: Tue May 12 21:29:14 2015 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue May 12 23:48:37 2015 +0300 ---------------------------------------------------------------------- .../main/admin/kerberos/step3_controller.js | 19 +++++- ambari-web/app/messages.js | 1 + .../app/templates/main/admin/kerberos/step3.hbs | 71 +++++++++++++++++++- 3 files changed, 89 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js index ef1ef8e..8946481 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js @@ -21,6 +21,7 @@ App.KerberosWizardStep3Controller = App.KerberosProgressPageController.extend({ clusterDeployState: 'KERBEROS_DEPLOY', serviceName: 'KERBEROS', componentName: 'KERBEROS_CLIENT', + ignore: undefined, commands: ['installKerberos', 'testKerberos'], @@ -102,6 +103,22 @@ App.KerberosWizardStep3Controller = App.KerberosProgressPageController.extend({ } else { wizardController.setLowerStepsDisable(3); } - }.observes('[email protected]') + }.observes('[email protected]'), + + /** + * Show or hide warning to ignore errors and continue with the install + */ + showIgnore: function() { + return this.get('tasks').someProperty('showRetry', true); + }.property('[email protected]'), + + /** + * Enable or disable next button if ignore checkbox ticked + */ + ignoreAndProceed: function() { + if (this.get('showIgnore')) { + this.set('isSubmitDisabled', !this.get('ignore')); + } + }.observes('ignore','showIgnore') }); http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 0f33660..3bc1cab 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -987,6 +987,7 @@ Em.I18n.translations = { 'admin.kerberos.wizard.step1.header': 'Get Started', 'admin.kerberos.wizard.step2.header': 'Configure Kerberos', 'admin.kerberos.wizard.step3.header': 'Install and Test Kerberos Client', + 'admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label': 'Ignore errors and continue to next step', 'admin.kerberos.wizard.step4.header': 'Configure Identities', 'admin.kerberos.wizard.step5.header': 'Confirm Configuration', 'admin.kerberos.wizard.step6.header': 'Stop Services', http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/templates/main/admin/kerberos/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs b/ambari-web/app/templates/main/admin/kerberos/step3.hbs index c74b677..a3a45a6 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs @@ -16,5 +16,74 @@ * limitations under the License. }} <div id="kerberos-wizard-step3"> - {{template "templates/common/progress"}} + <div id="common-progress-page"> + <h2>{{view.headerTitle}}</h2> + + <div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}} + {{#if controller.showRetry}} + <a href="#" {{action retry target="controller"}}> + {{t common.retry}} + </a> + {{/if}} + </div> + {{#if controller.isLoaded}} + <div class="clearfix"> + {{#each task in controller.tasks}} + {{#view view.taskView contentBinding="task"}} + <div class="item"> + <div {{bindAttr class=":pull-left view.linkClass view.parentView.labelWidth"}}> + <i {{bindAttr class="view.icon view.iconColor"}}></i> + <a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a> + </div> + <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}> + <div {{bindAttr class=":progress-bar controller.isRollback::span8 controller.isRollback:span3"}}> + <div class="progress-striped active progress-info progress"> + <div class="bar" {{bindAttr style="view.barWidth"}}></div> + </div> + </div> + <div {{bindAttr class=":span1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div> + </div> + <div> + {{#if task.showRetry}} + <a {{action retryTask target="controller"}} class="btn btn-primary retry" + rel="tooltip" + data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}> + <i class="icon-repeat icon-white"></i> + {{t common.retry}} + </a> + + {{/if}} + {{#if task.showRollback}} + <a {{action rollback target="controller"}} class="btn btn-primary retry"> + <i class="icon-repeat icon-white"></i> + {{t common.rollBack}} + </a> + {{/if}} + {{#if task.showSkip}} + <a {{action skipTask target="controller"}} class="btn btn-primary retry"> + <i class="icon-step-forward icon-white"></i> + {{t common.skip}} + </a> + {{/if}} + </div> + </div> + {{/view}} + + {{/each}} + </div> + {{#if showIgnore}} + <div class="alert alert-warning"> + <label>{{view Em.Checkbox classNames="checkbox" checkedBinding="ignore"}} {{t admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label}}</label> + </div> + {{/if}} + {{else}} + <div class="spinner"></div> + {{/if}} + <div class="btn-area"> + {{#if view.showBackButton}} + <button class="btn pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button> + {{/if}} + <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action done target="controller"}}>{{{view.submitButtonText}}}</button> + </div> + </div> </div>
