MAAS

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

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

Commit message

Use cluster_name instead of name for the cluster that appears over the websocket.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
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/node-details.html'
--- src/maasserver/static/partials/node-details.html 2015-09-25 14:39:44 +0000
+++ src/maasserver/static/partials/node-details.html 2015-09-25 19:33:01 +0000
@@ -138,7 +138,7 @@
138 <select name="cluster" id="cluster" placeholder="Choose a cluster"138 <select name="cluster" id="cluster" placeholder="Choose a cluster"
139 data-ng-disabled="!summary.editing"139 data-ng-disabled="!summary.editing"
140 data-ng-model="summary.cluster.selected"140 data-ng-model="summary.cluster.selected"
141 data-ng-options="cluster as cluster.name for cluster in summary.cluster.options">141 data-ng-options="cluster as cluster.cluster_name for cluster in summary.cluster.options">
142 <option value="" disabled="disabled">Choose a cluster</option>142 <option value="" disabled="disabled">Choose a cluster</option>
143 </select>143 </select>
144 </div>144 </div>