Merge ~andreserl/maas:2.2 into maas:2.2

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
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
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.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

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