Jelajahi Sumber

AMBARI-16985. "Wizard in progress" bar should not look clickable (akovalenko)

Aleksandr Kovalenko 9 tahun lalu
induk
melakukan
a2e2f8e576

+ 0 - 5
ambari-web/app/controllers/global/wizard_watcher_controller.js

@@ -37,11 +37,6 @@ App.WizardWatcherController = Em.Controller.extend(App.UserPref, {
    */
   controllerName: null,
 
-  /**
-   * @type {Function}
-   */
-  mock: Em.K,
-
   /**
    * define whether Wizard is running
    * @type {boolean}

+ 7 - 5
ambari-web/app/templates/application.hbs

@@ -107,12 +107,14 @@
             <div class="span11">
               {{#if isExistingClusterDataLoaded}}
                 <p class="span4 offset4">
+                {{#if App.router.wizardWatcherController.isNonWizardUser}}
+                  <span class="brand cluster-name">
+                    <span class="label upgrade-in-progress">
+                      <i class="icon-cog"></i>&nbsp;{{App.router.wizardWatcherController.wizardDisplayName}}
+                    </span>
+                  </span>
+                {{/if}}
                 <a class="brand cluster-name" href="#">
-                  {{#if App.router.wizardWatcherController.isNonWizardUser}}
-                      <span class="label upgrade-in-progress" {{action "mock" target="App.router.wizardWatcherController"}}>
-                        <i class="icon-cog"></i>&nbsp;{{App.router.wizardWatcherController.wizardDisplayName}}
-                      </span>
-                  {{/if}}
                   {{#if App.upgradeInProgress}}
                     {{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
                       <span