Merge ~andreserl/maas:2.2 into maas:2.2

Proposed by Andres Rodriguez on 2017-07-12
Status: Merged
Approved by: Andres Rodriguez on 2017-07-13
Approved revision: 3707170dc2c20374908a1fa165da8c846c039427
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:2.2
Merge into: maas:2.2
Diff against target: 25 lines (+3/-0)
2 files modified
docs/changelog.rst (+2/-0)
src/maasserver/static/partials/domain-details.html (+1/-0)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2017-07-13
Review via email: mp+327341@code.launchpad.net

Commit message

LP: #1703713 - Fix missing link on domain details page

To post a comment you must log in.
review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/docs/changelog.rst b/docs/changelog.rst
2index 814d9e9..1ce87bc 100644
3--- a/docs/changelog.rst
4+++ b/docs/changelog.rst
5@@ -12,6 +12,8 @@ LP: #1651165 Update the disk when editing the disk in the UI and not only the fi
6
7 LP: #1686678 Allows the domain of controllers to be changed in the UI.
8
9+LP: #1703713 Fix missing link on domain details page
10+
11
12 2.2.1
13 =====
14diff --git a/src/maasserver/static/partials/domain-details.html b/src/maasserver/static/partials/domain-details.html
15index f08f585..70c9938 100644
16--- a/src/maasserver/static/partials/domain-details.html
17+++ b/src/maasserver/static/partials/domain-details.html
18@@ -69,6 +69,7 @@
19 Node type is an enum (see node-details.html) and the comment therein.
20 -->
21 <span data-ng-switch-when="0"><a href="#/node/machine/{$ row.system_id $}">{$ row.name $}</a></span>
22+ <span data-ng-switch-when="1"><a href="#/node/device/{$ row.system_id $}">{$ row.name $}</a></span>
23 <span data-ng-switch-when="2"><a href="#/node/controller/{$ row.system_id $}">{$ row.name $}</a></span>
24 <span data-ng-switch-when="3"><a href="#/node/controller/{$ row.system_id $}">{$ row.name $}</a></span>
25 <span data-ng-switch-when="4"><a href="#/node/controller/{$ row.system_id $}">{$ row.name $}</a></span>

Subscribers

People subscribed via source and target branches