Merge lp:~newell-jensen/maas/fix-1629430 into lp:~maas-committers/maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5554
Proposed branch: lp:~newell-jensen/maas/fix-1629430
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/static/partials/nodes-list.html (+1/-1)
To merge this branch: bzr merge lp:~newell-jensen/maas/fix-1629430
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+310571@code.launchpad.net

Commit message

Change `have been` to `are transitioning to` to reflect that the nodes are actually transitioning into this new state.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) :
review: Needs Information
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Replied inline.

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Replied to my reply for extra information.

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Check to see if those are used anywhere else in MAAS. I believe they are not and only used in the UI. If so then change the remaining 4 to work.

Revision history for this message
Newell Jensen (newell-jensen) wrote :

> Check to see if those are used anywhere else in MAAS. I believe they are not
> and only used in the UI. If so then change the remaining 4 to work.

After some more thought I think that changing 'have been' to 'are transitioning to' is better as it will work with the other action display sentences as well.

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Sounds good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/nodes-list.html'
2--- src/maasserver/static/partials/nodes-list.html 2016-11-08 14:05:47 +0000
3+++ src/maasserver/static/partials/nodes-list.html 2016-11-14 19:28:39 +0000
4@@ -180,7 +180,7 @@
5 <p class="page-header__message" data-ng-show="hasActionsInProgress('nodes')">
6 <i class="icon icon--loading u-animation--spin"></i>
7 {$ tabs.nodes.actionProgress.completed $} of {$ tabs.nodes.actionProgress.total $}
8- nodes have been {$ tabs.nodes.actionOption.sentence $}.
9+ nodes are transitioning to {$ tabs.nodes.actionOption.sentence $}.
10 </p>
11 <p class="page-header__message page-header__message--error"
12 data-ng-repeat="(error, nodes) in tabs.nodes.actionProgress.errors">