MAAS

Merge lp:~blake-rouse/maas/fix-1442280 into lp:~maas-committers/maas/trunk

  1. fix-1442280
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 3813
Proposed branch: lp:~blake-rouse/maas/fix-1442280
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 84 lines (+9/-9)
1 file modified
src/maasserver/static/partials/nodes-list.html (+9/-9)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1442280
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+255734@code.launchpad.net

Commit message

Order filters by name instead of by count.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/nodes-list.html'
2--- src/maasserver/static/partials/nodes-list.html 2015-04-09 03:31:22 +0000
3+++ src/maasserver/static/partials/nodes-list.html 2015-04-09 18:18:55 +0000
4@@ -332,7 +332,7 @@
5 <div class="accordion__tab-content">
6 <ul class="accordion__tab-list">
7 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->
8- <li class="accordion__tab-item" data-ng-repeat="status in tabs.nodes.metadata.status | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('status', status.name, 'nodes') }">
9+ <li class="accordion__tab-item" data-ng-repeat="status in tabs.nodes.metadata.status | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('status', status.name, 'nodes') }">
10 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('status', status.name, 'nodes')">{$ status.name $} ({$ status.count $})</a>
11 </li>
12 </ul>
13@@ -342,7 +342,7 @@
14 <h4 class="accordion__tab-title maas-accordion-tab">Owner</h4>
15 <div class="accordion__tab-content">
16 <ul class="accordion__tab-list">
17- <li class="accordion__tab-item" data-ng-repeat="owner in tabs.nodes.metadata.owner | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('owner', owner.name, 'nodes') }">
18+ <li class="accordion__tab-item" data-ng-repeat="owner in tabs.nodes.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('owner', owner.name, 'nodes') }">
19 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'nodes')">{$ owner.name $} ({$ owner.count $})</a>
20 </li>
21 </ul>
22@@ -352,7 +352,7 @@
23 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
24 <div class="accordion__tab-content">
25 <ul class="accordion__tab-list">
26- <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.tags | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('tags', tag.name, 'nodes') }">
27+ <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('tags', tag.name, 'nodes') }">
28 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
29 </li>
30 </ul>
31@@ -362,7 +362,7 @@
32 <h4 class="accordion__tab-title maas-accordion-tab">Storage Tags</h4>
33 <div class="accordion__tab-content">
34 <ul class="accordion__tab-list">
35- <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.storage_tags | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('storage_tags', tag.name, 'nodes') }">
36+ <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.storage_tags | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('storage_tags', tag.name, 'nodes') }">
37 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('storage_tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
38 </li>
39 </ul>
40@@ -372,7 +372,7 @@
41 <h4 class="accordion__tab-title maas-accordion-tab">Networks</h4>
42 <div class="accordion__tab-content">
43 <ul class="accordion__tab-list">
44- <li class="accordion__tab-item" data-ng-repeat="network in tabs.nodes.metadata.networks | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('networks', network.name, 'nodes') }">
45+ <li class="accordion__tab-item" data-ng-repeat="network in tabs.nodes.metadata.networks | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('networks', network.name, 'nodes') }">
46 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('networks', network.name, 'nodes')">{$ network.name $} ({$ network.count $})</a>
47 </li>
48 </ul>
49@@ -382,7 +382,7 @@
50 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
51 <div class="accordion__tab-content">
52 <ul class="accordion__tab-list">
53- <li class="accordion__tab-item" data-ng-repeat="zone in tabs.nodes.metadata.zone | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('zone', zone.name, 'nodes') }">
54+ <li class="accordion__tab-item" data-ng-repeat="zone in tabs.nodes.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('zone', zone.name, 'nodes') }">
55 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'nodes')">{$ zone.name $} ({$ zone.count $})</a>
56 </li>
57 </ul>
58@@ -398,7 +398,7 @@
59 <h4 class="accordion__tab-title maas-accordion-tab active">Owner</h4>
60 <div class="accordion__tab-content">
61 <ul class="accordion__tab-list">
62- <li class="accordion__tab-item" data-ng-repeat="owner in tabs.devices.metadata.owner | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('owner', owner.name, 'devices') }">
63+ <li class="accordion__tab-item" data-ng-repeat="owner in tabs.devices.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('owner', owner.name, 'devices') }">
64 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'devices')">{$ owner.name $} ({$ owner.count $})</a>
65 </li>
66 </ul>
67@@ -408,7 +408,7 @@
68 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
69 <div class="accordion__tab-content">
70 <ul class="accordion__tab-list">
71- <li class="accordion__tab-item" data-ng-repeat="tag in tabs.devices.metadata.tags | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('tags', tag.name, 'devices') }">
72+ <li class="accordion__tab-item" data-ng-repeat="tag in tabs.devices.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('tags', tag.name, 'devices') }">
73 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'devices')">{$ tag.name $} ({$ tag.count $})</a>
74 </li>
75 </ul>
76@@ -418,7 +418,7 @@
77 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
78 <div class="accordion__tab-content">
79 <ul class="accordion__tab-list">
80- <li class="accordion__tab-item" data-ng-repeat="zone in tabs.devices.metadata.zone | orderBy:['-count', 'name']" data-ng-class="{ active: isFilterActive('zone', zone.name, 'devices') }">
81+ <li class="accordion__tab-item" data-ng-repeat="zone in tabs.devices.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ active: isFilterActive('zone', zone.name, 'devices') }">
82 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'devices')">{$ zone.name $} ({$ zone.count $})</a>
83 </li>
84 </ul>