Kaynağa Gözat

AMBARI-9177 Manual Steps should have "Do This Later" button. (atkach)

Andrii Tkach 10 yıl önce
ebeveyn
işleme
a8b57314a2

+ 1 - 0
ambari-web/app/messages.js

@@ -1325,6 +1325,7 @@ Em.I18n.translations = {
 
   'admin.stackVersions.details.install.hosts.popup.title': "Install {0} version",
 
+  'admin.stackUpgrade.doThisLater': "Do This Later",
   'admin.stackUpgrade.downgrade.proceed': "Proceed with Downgrade",
   'admin.stackUpgrade.downgrade.title': "Downgrade to {0}",
   'admin.stackUpgrade.downgrade.body': "Are you sure you wish to abort the upgrade process and downgrade to {0}",

+ 1 - 0
ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs

@@ -90,6 +90,7 @@
               {{#if view.isDowngradeAvailable}}
                 <button class="btn btn-danger" {{action confirmDowngrade target="controller"}}>{{t common.downgrade}}</button>
               {{/if}}
+              <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.doThisLater}}</button>
               <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}>
                 {{t common.proceed}}
               </button>

+ 1 - 1
ambari-web/app/views/main/admin/stack_upgrade/versions_view.js

@@ -106,7 +106,6 @@ App.MainAdminStackVersionsView = Em.View.extend({
    * @type {Array}
    */
   versions: function () {
-    var currentVersion = this.get('controller.currentVersion');
     var versions = this.get('repoVersions').map(function (version) {
       var versionFormatted = Em.Object.create({
         id: version.get('id'),
@@ -148,6 +147,7 @@ App.MainAdminStackVersionsView = Em.View.extend({
    * @return {Array}
    */
   filterBy: function (versions, filter) {
+    var currentVersion = this.get('controller.currentVersion');
     if (filter && filter.get('value')) {
       return versions.filter(function (version) {
         if (version.get('status') === 'INSTALLED' && filter.get('value') === 'UPGRADE_READY') {