incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1492512 - in /incubator/ambari/trunk/ambari-web/app: templates/main/admin/cluster.hbs views/main/admin.js
Date Thu, 13 Jun 2013 00:43:34 GMT
Author: yusaku
Date: Thu Jun 13 00:43:33 2013
New Revision: 1492512

URL: http://svn.apache.org/r1492512
Log:
AMBARI-2372. Show installed stack and its services. (yusaku)

Modified:
    incubator/ambari/trunk/ambari-web/app/templates/main/admin/cluster.hbs
    incubator/ambari/trunk/ambari-web/app/views/main/admin.js

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/admin/cluster.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/admin/cluster.hbs?rev=1492512&r1=1492511&r2=1492512&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/admin/cluster.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/admin/cluster.hbs Thu Jun 13 00:43:33
2013
@@ -19,11 +19,13 @@
 <div class="admin-cluster">
     <div class="header">
         <strong>{{t admin.cluster.stackVersion}}: {{App.currentStackVersion}}
+          {{#if App.supports.stackUpgrade}}
             (<a href="true" {{bindAttr class="view.isUpgradeAvailable::inactive"}}{{action
"upgradeStack"}}>
             {{#if view.isUpgradeAvailable}}{{t admin.cluster.upgradeAvailable}}: {{upgradeVersion}}
             {{else}} {{t admin.cluster.upgradeUnavailable}}
             {{/if}}
             </a>)
+          {{/if}}
         </strong>
     </div>
     <table class="table table-bordered table-striped">

Modified: incubator/ambari/trunk/ambari-web/app/views/main/admin.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/admin.js?rev=1492512&r1=1492511&r2=1492512&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/admin.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/admin.js Thu Jun 13 00:43:33 2013
@@ -33,14 +33,12 @@ App.MainAdminView = Em.View.extend({
         url: 'adminSecurity.index',
         label: Em.I18n.t('common.security')
       });
-    }
-    if (App.supports.stackUpgrade) {
-      items.push({
-        name: 'cluster',
-        url: 'adminCluster',
-        label: Em.I18n.t('common.cluster')
-      });
-    }
+    };
+    items.push({
+      name: 'cluster',
+      url: 'adminCluster',
+      label: Em.I18n.t('common.cluster')
+    });
     items.push({
       name: 'misc',
       url: 'adminMisc',



Mime
View raw message