External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

add title parameter to rbac modal directives

Browse Source 
related to #4048
This commit is contained in:
Chris Meyers
2017-01-11 10:58:40 -05:00
parent 833c61c8cb
commit e1ce3c3199
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
View File

@@ -15,7 +15,8 @@ export default ['templateUrl', '$state',
usersDataset: '=', usersDataset: '=',
teamsDataset: '=', teamsDataset: '=',
resourceData: '=', resourceData: '=',
withoutTeamPermissions: '@' withoutTeamPermissions: '@',
title: '@'
}, },
controller: controller, controller: controller,
templateUrl: templateUrl('access/add-rbac-resource/rbac-resource'), templateUrl: templateUrl('access/add-rbac-resource/rbac-resource'),

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

@@ -8,7 +8,7 @@
<div class="List-titleText ng-binding"> <div class="List-titleText ng-binding">
{{ object.name || object.username }} {{ object.name || object.username }}
<div class="List-titleLockup"></div> <div class="List-titleLockup"></div>
Add Permissions {{ title }}
</div> </div>
</div> </div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">

3
awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.directive.js
View File

@@ -11,7 +11,8 @@ export default ['templateUrl',
return { return {
restrict: 'E', restrict: 'E',
scope: { scope: {
resolve: "=" resolve: "=",
title: "@",
}, },
controller: controller, controller: controller,
templateUrl: templateUrl('access/add-rbac-user-team/rbac-user-team'), templateUrl: templateUrl('access/add-rbac-user-team/rbac-user-team'),

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

@@ -9,7 +9,7 @@
<div class="List-titleText ng-binding"> <div class="List-titleText ng-binding">
{{ owner.name || owner.username }} {{ owner.name || owner.username }}
<div class="List-titleLockup"></div> <div class="List-titleLockup"></div>
Add Permissions {{ title }}
</div> </div>
</div> </div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">

6
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -267,7 +267,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat
}, },
views: { views: {
[`modal@${formStateDefinition.name}`]: { [`modal@${formStateDefinition.name}`]: {
template: `<add-rbac-user-team resolve="$resolve"></add-rbac-user-team>` template: `<add-rbac-user-team resolve="$resolve" title="Add Permissions"></add-rbac-user-team>`
} }
}, },
resolve: { resolve: {
@@ -332,7 +332,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat
}, },
views: { views: {
[`modal@${formStateDefinition.name}`]: { [`modal@${formStateDefinition.name}`]: {
template: `<add-rbac-resource users-dataset="$resolve.usersDataset" teams-dataset="$resolve.teamsDataset" selected="allSelected" resource-data="$resolve.resourceData"></add-rbac-resource>` template: `<add-rbac-resource users-dataset="$resolve.usersDataset" teams-dataset="$resolve.teamsDataset" selected="allSelected" resource-data="$resolve.resourceData" title="Add Users / Teams"></add-rbac-resource>`
} }
}, },
resolve: { resolve: {
@@ -501,7 +501,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat
}, },
views: { views: {
[`modal@${formStateDefinition.name}`]: { [`modal@${formStateDefinition.name}`]: {
template: `<add-rbac-resource users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true"></add-rbac-resource>` template: `<add-rbac-resource users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true" title="Add Users"></add-rbac-resource>`
} }
}, },
resolve: { resolve: {