ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-8791. Install Wizard: Manage Ambari link not available (unless you visit Views) (onechiporenko)
Date Thu, 18 Dec 2014 15:30:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8dba77e8b -> 0a05a2f7d


AMBARI-8791. Install Wizard: Manage Ambari link not available (unless you visit Views) (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a05a2f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a05a2f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a05a2f7

Branch: refs/heads/trunk
Commit: 0a05a2f7db2870b81f7bc344b63f13030d240edb
Parents: 8dba77e
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Thu Dec 18 17:29:59 2014 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Thu Dec 18 17:29:59 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/templates/application.hbs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0a05a2f7/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 818c3e9..d2dc923 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -57,10 +57,18 @@
               </button>
               <ul class="dropdown-menu">
                   <li><a href="" {{action showAboutPopup target="controller"}}>{{t
app.aboutAmbari}}</a></li>
-                {{#if isClusterDataLoaded}}
+                {{#if App.router.clusterInstallCompleted}}
+                  {{#if isClusterDataLoaded}}
+                    {{#isAccessible upgrade_ONLY_ADMIN}}
+                      <li><a href="" {{action goToAdminView target="controller"}}>{{t
app.manageAmbari}}</a></li>
+                    {{/isAccessible}}
+                  {{/if}}
+                {{else}}
                   {{#isAccessible upgrade_ONLY_ADMIN}}
                     <li><a href="" {{action goToAdminView target="controller"}}>{{t
app.manageAmbari}}</a></li>
                   {{/isAccessible}}
+                {{/if}}
+                {{#if isClusterDataLoaded}}
                   {{#isAccessible upgrade_ADMIN}}
                     <li><a href="" {{action showSettingsPopup target="controller"}}>{{t
app.settings}}</a></li>
                   {{/isAccessible}}


Mime
View raw message