Skip to content

Commit

Permalink
Merge pull request #2411 from benjaminapetersen/membership/service-ac…
Browse files Browse the repository at this point in the history
…count-without-a-namespace

Automatic merge from submit-queue.

Fix adding role to service account where namespace is sometimes missed

This PR addresses an inconsistency.  Watch the gif to the end:

![2017-10-31 15 36 47](https://user-images.githubusercontent.com/280512/32245466-3966c316-be52-11e7-99c3-f135e8845cc2.gif)

The change is simple. I'm not 100% sure why the edit worked fine the first new service account but not the second.  

@jwforres @spadgett
  • Loading branch information
openshift-merge-robot authored Oct 31, 2017
2 parents a3423f8 + 5df981c commit 020f993
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/membership.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h3>
</ui-select>
<button
ng-disabled="disableAddForm || (!subject.newRole)"
ng-click="addRoleTo(subject.name, subjectKind.name, subject.newRole)"
ng-click="addRoleTo(subject.name, subjectKind.name, subject.newRole, subject.namespace)"
class="btn btn-default add-role-to">
Add
</button>
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -10718,7 +10718,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</ui-select-choices>\n" +
"</ui-select>\n" +
"<button ng-disabled=\"disableAddForm || (!subject.newRole)\" ng-click=\"addRoleTo(subject.name, subjectKind.name, subject.newRole)\" class=\"btn btn-default add-role-to\">\n" +
"<button ng-disabled=\"disableAddForm || (!subject.newRole)\" ng-click=\"addRoleTo(subject.name, subjectKind.name, subject.newRole, subject.namespace)\" class=\"btn btn-default add-role-to\">\n" +
"Add\n" +
"</button>\n" +
"</div>\n" +
Expand Down

0 comments on commit 020f993

Please sign in to comment.