External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2403 from wenottingham/read-all-about-it

Browse Source 
Don't filter out read role.
This commit is contained in:
Bill Nottingham 2018-07-05 20:04:54 -04:00 committed by GitHub
commit dd8ca48bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/access/add-rbac-resource/rbac-resource.controller.js
View File

@ -25,9 +25,7 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr
// the object permissions are being added to
scope.object = scope.resourceData.data;
// array for all possible roles for the object
scope.roles = _.omit(scope.object.summary_fields.object_roles, (key) => {
return key.name === 'Read';
});
scope.roles = scope.object.summary_fields.object_roles;
// TODO: get working with api
// array w roles and descriptions for key

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@ -67,7 +67,7 @@
<div class="AddPermissions-keyPane"
ng-show="showKeyPane">
<div class="AddPermissions-keyRow"
ng-repeat="key in roleKey | filter:{name: '!Read'}">
ng-repeat="key in roleKey">
<div class="AddPermissions-keyName">
{{ key.name }}
</div>

2
awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js
View File

@ -78,7 +78,7 @@ function(scope, $state, i18n, CreateSelect2, Rest, $q, Wait, ProcessErrors) {
// aggregate name/descriptions for each available role, based on resource type
// reasoning:
function aggregateKey(item, type){
_.merge(scope.keys[type], _.omit(item.summary_fields.object_roles, 'read_role'));
_.merge(scope.keys[type], item.summary_fields.object_roles);
}
scope.closeModal = function() {