MAAS

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

  1. fix-1580827
  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: 5019
Proposed branch: lp:~blake-rouse/maas/fix-1580827
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 15 lines (+3/-2)
1 file modified
src/maasserver/static/partials/node-details.html (+3/-2)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1580827
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+294561@code.launchpad.net

Commit message

Show 'Add special filesystem' button only when ready or allocated.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Really simple just a change to the HTML, was just missing:

data-ng-if="!isAllStorageDisabled()"

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/node-details.html'
2--- src/maasserver/static/partials/node-details.html 2016-05-02 23:42:57 +0000
3+++ src/maasserver/static/partials/node-details.html 2016-05-12 19:38:55 +0000
4@@ -1105,8 +1105,9 @@
5 </section>
6 <a class="link-cta-ubuntu secondary tooltip"
7 data-tooltip="Create a tmpfs or ramfs filesystem"
8- ng-disabled="dropdown !== null"
9- ng-click="addSpecialFilesystem()">Add special filesystem</a>
10+ data-ng-disabled="dropdown !== null"
11+ data-ng-if="!isAllStorageDisabled()"
12+ data-ng-click="addSpecialFilesystem()">Add special filesystem</a>
13 </div>
14 <div class="twelve-col padding-bottom" data-ng-show="cachesets.length">
15 <h3>Available cache sets</h3>