Merge ~newell-jensen/maas:lp1759708 into maas:master

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: fca5215a58bee09fb3a1602f8d5abd324a82e176
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:lp1759708
Merge into: maas:master
Diff against target: 37 lines (+3/-4)
1 file modified
src/maasserver/static/partials/pod-details.html (+3/-4)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
MAAS Lander Approve
Review via email: mp+342624@code.launchpad.net

Commit message

LP: #1759708 -- Surface error to the pod configuration UI.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Whoever reviews this, I would like them to run it on a live system and see if they like the way things look.

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1759708 lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fca5215a58bee09fb3a1602f8d5abd324a82e176

review: Approve
Revision history for this message
Mike Pontillo (mpontillo) wrote :

LGTM!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
2index a295185..f8dc201 100644
3--- a/src/maasserver/static/partials/pod-details.html
4+++ b/src/maasserver/static/partials/pod-details.html
5@@ -208,13 +208,13 @@
6 </div>
7 <div class="col-2">
8 <button class="p-button--neutral u-float--right"
9- data-ng-if="canEdit()"
10+ data-ng-if="canEdit() && !editing"
11 data-ng-click="editPodConfiguration()">Edit</button>
12 </div>
13 </div>
14 <div class="row">
15 <maas-obj-form obj="pod" manager="podManager" manager-method="updateItem"
16- table-form="true" save-on-blur="false" data-ng-disabled="!editing">
17+ table-form="true" save-on-blur="false" after-save="exitEditPodConfiguration" data-ng-disabled="!editing">
18 <div class="col-6">
19 <div class="col-6">
20 <dl>
21@@ -229,7 +229,6 @@
22 </div>
23 <div class="col-6">
24 <maas-pod-parameters hide-type="true"></maas-pod-parameters>
25- <maas-obj-errors></maas-obj-errors>
26 </div>
27 <div class="row">
28 <div class="col-12 u-align--right" data-ng-if="editing">
29@@ -237,7 +236,7 @@
30 <p maas-obj-show-saving><maas-obj-saving>Trying to connect and discover pod</maas-obj-saving></p>
31 <button class="p-button--base"
32 data-ng-click="exitEditPodConfiguration()">Cancel</button>
33- <button class="p-button--positive" data-ng-click="exitEditPodConfiguration()" maas-obj-save>Save changes</button>
34+ <button class="p-button--positive" maas-obj-save>Save changes</button>
35 </div>
36 </div>
37 </maas-obj-form>

Subscribers

People subscribed via source and target branches