Author: yusaku
Date: Sat Jan 19 01:24:31 2013
New Revision: 1435441
URL: http://svn.apache.org/viewvc?rev=1435441&view=rev
Log:
AMBARI-1220. Oozie service summary update. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1435441&r1=1435440&r2=1435441&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 19 01:24:31 2013
@@ -17,6 +17,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1220. Oozie service summary update. (yusaku)
+
AMBARI-1218. Refactor Job Browser User filter. (yusaku)
AMBARI-1217. Tighten up spacing for the rows in the Hosts table. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs?rev=1435441&r1=1435440&r2=1435441&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
(original)
+++
incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
Sat Jan 19 01:24:31 2013
@@ -27,10 +27,7 @@
<tr>
<td class="summary-label">Clients</td>
<td>
- {{#each view.clients}}
- <a {{action filterHosts view.clientObj}}
href="javascript:void(null)">{{displayName}}</a>{{#if isComma}}, {{/if}}
- {{#if isAnd}} and {{/if}}
- {{/each}}
+ <a {{action filterHosts view.clientObj}}
href="javascript:void(null)">{{view.clients.length}} Oozie Client{{#if
view.hasManyClients}}s{{/if}}</a>
</td>
</tr>
<tr>
Modified:
incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js?rev=1435441&r1=1435440&r2=1435441&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
Sat Jan 19 01:24:31 2013
@@ -49,32 +49,9 @@ App.MainServiceInfoSummaryView = Em.View
var result = [];
var service = this.get('controller.content');
if (service.get("id") == "OOZIE" || service.get("id") == "ZOOKEEPER") {
- var clients = service.get('hostComponents').filterProperty('isClient');
- if (clients.length > 0) {
- result = [{
- 'displayName': clients[0].get('displayName'),
- 'isComma': false,
- 'isAnd': false
- }];
- }
- if (clients.length > 1) {
- result[0].isComma = true;
- result.push({
- 'displayName': clients[1].get('displayName'),
- 'isComma': false,
- 'isAnd': false
- });
- }
- if (clients.length > 2) {
- result[1].isAnd = true;
- result.push({
- 'displayName': clients.length - 2 + ' more',
- 'isComma': false,
- 'isAnd': false
- });
- }
+ return service.get('hostComponents').filterProperty('isClient');
}
- return result;
+ return [];
}.property('controller.content'),
hasManyServers: function () {
