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

Merge pull request #2546 from anoek/2335

Browse Source 
Minor tweaks to the permissions list and modal on the Teams page
This commit is contained in:
Akita Noek 2016-06-22 10:53:30 -04:00 committed by GitHub
commit c6cd966fc8
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/access/addPermissions/addPermissions.directive.js
View File

@ -16,6 +16,7 @@ export default
controller: addPermissionsController,
templateUrl: templateUrl('access/addPermissions/addPermissions'),
link: function(scope, element, attrs, ctrl) {
scope.withoutTeamPermissions = attrs.withoutTeamPermissions;
scope.toggleFormTabs('users');
$("body").addClass("is-modalOpen");
@ -24,6 +25,7 @@ export default
Wait('start');
scope.$broadcast("linkLists");
setTimeout(function() {

11
awx/ui/client/src/access/addPermissions/addPermissions.partial.html
View File

@ -23,10 +23,15 @@
<span class="AddPermissions-directionNumber">
1
</span>
Please select Users / Teams from the lists below.
<div ng-hide='withoutTeamPermissions'>
Please select Users / Teams from the lists below.
</div>
<div ng-show='withoutTeamPermissions'>
Please select Users from the list below.
</div>
</div>
<div class="Form-tabHolder">
<div class="Form-tabHolder" ng-hide='withoutTeamPermissions'>
<div id="users_tab" class="Form-tab"
ng-click="toggleFormTabs('users')"
ng-class="{'is-selected': usersSelected }">
@ -67,7 +72,7 @@
<div class="AddPermissions-keyPane"
ng-show="showKeyPane">
<div class="AddPermissions-keyRow"
ng-repeat="key in roleKey">
ng-repeat="key in roleKey | filter:{name: '!Read'}">
<div class="AddPermissions-keyName">
{{ key.name }}
</div>

2
awx/ui/client/src/access/addPermissions/roleSelect.directive.js
View File

@ -12,7 +12,7 @@ export default
return {
restrict: 'E',
scope: false,
template: '<select ng-cloak class="AddPermissions-selectHide roleSelect2 form-control" ng-model="obj.roles" ng-options="role.label for role in roles track by role.value" multiple required></select>',
template: '<select ng-cloak class="AddPermissions-selectHide roleSelect2 form-control" ng-model="obj.roles" ng-options="role.label for role in roles | filter:{label: \'!Read\'} track by role.value" multiple required></select>',
link: function(scope, element, attrs, ctrl) {
CreateSelect2({
element: '.roleSelect2',

3
awx/ui/client/src/app.js
View File

@ -530,6 +530,9 @@ var tower = angular.module('Tower', [
$rootScope.addPermission = function (scope) {
$compile("<add-permissions class='AddPermissions'></add-permissions>")(scope);
};
$rootScope.addPermissionWithoutTeamTab = function (scope) {
$compile("<add-permissions class='AddPermissions' without-team-permissions='true'></add-permissions>")(scope);
};
$rootScope.deletePermission = function (user, accessListEntry) {
let entry = accessListEntry;

9
awx/ui/client/src/forms/Teams.js
View File

@ -71,7 +71,7 @@ export default
searchType: 'select',
actions: {
add: {
ngClick: "addPermission",
ngClick: "addPermissionWithoutTeamTab",
label: 'Add',
awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit',
@ -92,13 +92,6 @@ export default
noSort: true,
class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
searchable: false
},
team_roles: {
label: 'Team Roles',
type: 'team_roles',
noSort: true,
class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
searchable: false
}
}
},