diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.directive.js b/awx/ui/client/src/access/addPermissions/addPermissions.directive.js index a9d21dfff8..57bb658788 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.directive.js +++ b/awx/ui/client/src/access/addPermissions/addPermissions.directive.js @@ -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() { diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html index 85fd03d7f9..725a6e273e 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html +++ b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html @@ -23,10 +23,15 @@ 1 - Please select Users / Teams from the lists below. +
+ Please select Users / Teams from the lists below. +
+
+ Please select Users from the list below. +
-
+
@@ -67,7 +72,7 @@
+ ng-repeat="key in roleKey | filter:{name: '!Read'}">
{{ key.name }}
diff --git a/awx/ui/client/src/access/addPermissions/roleSelect.directive.js b/awx/ui/client/src/access/addPermissions/roleSelect.directive.js index c11dbe0e67..53bc191a6d 100644 --- a/awx/ui/client/src/access/addPermissions/roleSelect.directive.js +++ b/awx/ui/client/src/access/addPermissions/roleSelect.directive.js @@ -12,7 +12,7 @@ export default return { restrict: 'E', scope: false, - template: '', + template: '', link: function(scope, element, attrs, ctrl) { CreateSelect2({ element: '.roleSelect2', diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 1816888ce8..8300d7d09c 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -530,6 +530,9 @@ var tower = angular.module('Tower', [ $rootScope.addPermission = function (scope) { $compile("")(scope); }; + $rootScope.addPermissionWithoutTeamTab = function (scope) { + $compile("")(scope); + }; $rootScope.deletePermission = function (user, accessListEntry) { let entry = accessListEntry; diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js index b8e9ba4f65..ad07a0ab2b 100644 --- a/awx/ui/client/src/forms/Teams.js +++ b/awx/ui/client/src/forms/Teams.js @@ -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 } } },