This is an automated email from the ASF dual-hosted git repository.

akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1f4cbb1  AMBARI-24080. [UI] Ambari label do not navigate to Dashboard 
page (akovalenko)
1f4cbb1 is described below

commit 1f4cbb161db8acb9f095ff2078a4d1ac99d64260
Author: Aleksandr Kovalenko <akovale...@apache.org>
AuthorDate: Tue Jun 12 14:42:52 2018 +0300

    AMBARI-24080. [UI] Ambari label do not navigate to Dashboard page 
(akovalenko)
---
 ambari-web/app/controllers/application.js |  6 ++++++
 ambari-web/app/messages.js                |  1 -
 ambari-web/app/templates/application.hbs  | 14 ++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ambari-web/app/controllers/application.js 
b/ambari-web/app/controllers/application.js
index aae8513..b935b22 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -132,6 +132,12 @@ App.ApplicationController = 
Em.Controller.extend(App.Persist, {
     App.router.route("adminView");
   },
 
+  goToDashboard: function () {
+    if (this.get('enableLinks')) {
+      App.router.route("main/dashboard");
+    }
+  },
+
   showAboutPopup: function() {
     App.ModalPopup.show({
       header: Em.I18n.t('common.aboutAmbari'),
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1dd12a2..9fa6a84 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -594,7 +594,6 @@ Em.I18n.translations = {
   'services.summary.selectHostForComponent': 'Select the host to add {0} 
component',
   'services.summary.allHostsAlreadyRunComponent': 'All hosts already running 
{0} component',
 
-  'topnav.logo.href':'/#/main/dashboard',
   
'topnav.help.href':'https://cwiki.apache.org/confluence/display/AMBARI/Ambari',
 
   'installer.header':'Cluster Install Wizard',
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index 91453ec..3590e9e 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -25,16 +25,10 @@
     <div class="navigation-bar-container">
     <ul class="side-nav-header nav nav-pills nav-stacked">
       <li class="navigation-header">
-        {{#if enableLinks}}
-          <a {{translateAttr href="topnav.logo.href"}} class="ambari-logo">
-            <img src="/img/ambari-logo.png" alt="Apache Ambari" title="Apache 
Ambari" {{QAAttr "ambari-logo"}}>
-          </a>
-        {{else}}
-          <a class="ambari-logo">
-            <img src="/img/ambari-logo.png" alt="Apache Ambari" title="Apache 
Ambari" {{QAAttr "ambari-logo"}}>
-          </a>
-        {{/if}}
-        <div class="btn-group">
+        <a href="#" {{action goToDashboard target="controller"}} 
class="ambari-logo">
+          <img src="/img/ambari-logo.png" alt="Apache Ambari" title="Apache 
Ambari" {{QAAttr "ambari-logo"}}>
+        </a>
+        <div class="btn-group" {{action goToDashboard target="controller"}}>
           <span class="ambari-header" title="Apache Ambari" {{QAAttr 
"ambari-title"}}>{{t app.name}}</span>
         </div>
       </li>

-- 
To stop receiving notification emails like this one, please contact
akovale...@apache.org.

Reply via email to