Merge ~andreserl/maas:really_fix_lp1771461_for_vlan into maas:master

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 3ea662601bf1aa076a123db84a3e823f0d15cbd4
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:really_fix_lp1771461_for_vlan
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/static/partials/vlan-details.html (+1/-1)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+345959@code.launchpad.net

Commit message

LP: #1771461 - Really fix issue to prevent normal users see the Edit button and not prevent admin users from seeing it.

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

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/vlan-details.html b/src/maasserver/static/partials/vlan-details.html
2index a075990..ba25320 100644
3--- a/src/maasserver/static/partials/vlan-details.html
4+++ b/src/maasserver/static/partials/vlan-details.html
5@@ -234,7 +234,7 @@
6 <h2 class="u-float--left">VLAN Summary</h2>
7 </div>
8 <div class="col-6">
9- <button type="button" name="button" class="p-button--neutral u-float--right" data-ng-click="vlanDetails.enterEditSummary()" data-ng-if="!vlanDetails.editSummary && isSuperUser()">Edit</button>
10+ <button type="button" name="button" class="p-button--neutral u-float--right" data-ng-click="vlanDetails.enterEditSummary()" data-ng-if="!vlanDetails.editSummary && vlanDetails.isSuperUser()">Edit</button>
11 </div>
12 </div>
13 <div class="p-form p-form--stacked row" data-ng-if="!vlanDetails.editSummary">

Subscribers

People subscribed via source and target branches