MAAS

Merge lp:~blake-rouse/maas/fix-1402736-1.7 into lp:maas/1.7

  1. fix-1402736-1.7
  2. Merge into 1.7
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 3330
Proposed branch: lp:~blake-rouse/maas/fix-1402736-1.7
Merge into: lp:maas/1.7
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/templates/maasserver/node_view.html (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1402736-1.7
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+244983@code.launchpad.net

Commit message

Use zone_url instead of zone in the data-field for zone link.

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

Self-approving backport.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/templates/maasserver/node_view.html'
2--- src/maasserver/templates/maasserver/node_view.html 2014-12-11 14:57:51 +0000
3+++ src/maasserver/templates/maasserver/node_view.html 2014-12-17 14:09:13 +0000
4@@ -214,7 +214,7 @@
5 <li id="zone" class="block size3">
6 <h4>Physical zone</h4>
7 <span>
8- <a data-field="zone" data-field-attr="href"
9+ <a data-field="zone_url" data-field-attr="href"
10 href="{% url 'zone-view' node.zone.name %}">
11 <span data-field="zone">{{ node.zone }}</span>
12 </a>

Subscribers

People subscribed via source and target branches

to all changes: