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
=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html 2015-04-09 03:31:22 +0000
+++ src/maasserver/static/partials/nodes-list.html 2015-04-09 18:18:55 +0000
@@ -332,7 +332,7 @@
332 <div class="accordion__tab-content">332 <div class="accordion__tab-content">
333 <ul class="accordion__tab-list">333 <ul class="accordion__tab-list">
334 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->334 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->
335 <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') }">335 <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') }">
336 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('status', status.name, 'nodes')">{$ status.name $} ({$ status.count $})</a>336 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('status', status.name, 'nodes')">{$ status.name $} ({$ status.count $})</a>
337 </li>337 </li>
338 </ul>338 </ul>
@@ -342,7 +342,7 @@
342 <h4 class="accordion__tab-title maas-accordion-tab">Owner</h4>342 <h4 class="accordion__tab-title maas-accordion-tab">Owner</h4>
343 <div class="accordion__tab-content">343 <div class="accordion__tab-content">
344 <ul class="accordion__tab-list">344 <ul class="accordion__tab-list">
345 <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') }">345 <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') }">
346 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'nodes')">{$ owner.name $} ({$ owner.count $})</a>346 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'nodes')">{$ owner.name $} ({$ owner.count $})</a>
347 </li>347 </li>
348 </ul>348 </ul>
@@ -352,7 +352,7 @@
352 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>352 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
353 <div class="accordion__tab-content">353 <div class="accordion__tab-content">
354 <ul class="accordion__tab-list">354 <ul class="accordion__tab-list">
355 <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') }">355 <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') }">
356 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>356 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
357 </li>357 </li>
358 </ul>358 </ul>
@@ -362,7 +362,7 @@
362 <h4 class="accordion__tab-title maas-accordion-tab">Storage Tags</h4>362 <h4 class="accordion__tab-title maas-accordion-tab">Storage Tags</h4>
363 <div class="accordion__tab-content">363 <div class="accordion__tab-content">
364 <ul class="accordion__tab-list">364 <ul class="accordion__tab-list">
365 <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') }">365 <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') }">
366 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('storage_tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>366 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('storage_tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</a>
367 </li>367 </li>
368 </ul>368 </ul>
@@ -372,7 +372,7 @@
372 <h4 class="accordion__tab-title maas-accordion-tab">Networks</h4>372 <h4 class="accordion__tab-title maas-accordion-tab">Networks</h4>
373 <div class="accordion__tab-content">373 <div class="accordion__tab-content">
374 <ul class="accordion__tab-list">374 <ul class="accordion__tab-list">
375 <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') }">375 <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') }">
376 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('networks', network.name, 'nodes')">{$ network.name $} ({$ network.count $})</a>376 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('networks', network.name, 'nodes')">{$ network.name $} ({$ network.count $})</a>
377 </li>377 </li>
378 </ul>378 </ul>
@@ -382,7 +382,7 @@
382 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>382 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
383 <div class="accordion__tab-content">383 <div class="accordion__tab-content">
384 <ul class="accordion__tab-list">384 <ul class="accordion__tab-list">
385 <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') }">385 <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') }">
386 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'nodes')">{$ zone.name $} ({$ zone.count $})</a>386 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'nodes')">{$ zone.name $} ({$ zone.count $})</a>
387 </li>387 </li>
388 </ul>388 </ul>
@@ -398,7 +398,7 @@
398 <h4 class="accordion__tab-title maas-accordion-tab active">Owner</h4>398 <h4 class="accordion__tab-title maas-accordion-tab active">Owner</h4>
399 <div class="accordion__tab-content">399 <div class="accordion__tab-content">
400 <ul class="accordion__tab-list">400 <ul class="accordion__tab-list">
401 <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') }">401 <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') }">
402 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'devices')">{$ owner.name $} ({$ owner.count $})</a>402 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('owner', owner.name, 'devices')">{$ owner.name $} ({$ owner.count $})</a>
403 </li>403 </li>
404 </ul>404 </ul>
@@ -408,7 +408,7 @@
408 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>408 <h4 class="accordion__tab-title maas-accordion-tab">Tags</h4>
409 <div class="accordion__tab-content">409 <div class="accordion__tab-content">
410 <ul class="accordion__tab-list">410 <ul class="accordion__tab-list">
411 <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') }">411 <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') }">
412 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'devices')">{$ tag.name $} ({$ tag.count $})</a>412 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('tags', tag.name, 'devices')">{$ tag.name $} ({$ tag.count $})</a>
413 </li>413 </li>
414 </ul>414 </ul>
@@ -418,7 +418,7 @@
418 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>418 <h4 class="accordion__tab-title maas-accordion-tab">Zones</h4>
419 <div class="accordion__tab-content">419 <div class="accordion__tab-content">
420 <ul class="accordion__tab-list">420 <ul class="accordion__tab-list">
421 <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') }">421 <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') }">
422 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'devices')">{$ zone.name $} ({$ zone.count $})</a>422 <a class="accordion__tab-link" href="" data-ng-click="toggleFilter('zone', zone.name, 'devices')">{$ zone.name $} ({$ zone.count $})</a>
423 </li>423 </li>
424 </ul>424 </ul>