From e1ce3c3199c9b30a4181a869d39f907a4d4720bd Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 11 Jan 2017 10:58:40 -0500 Subject: [PATCH] add title parameter to rbac modal directives related to #4048 --- .../src/access/add-rbac-resource/rbac-resource.directive.js | 3 ++- .../src/access/add-rbac-resource/rbac-resource.partial.html | 2 +- .../access/add-rbac-user-team/rbac-user-team.directive.js | 3 ++- .../access/add-rbac-user-team/rbac-user-team.partial.html | 2 +- awx/ui/client/src/shared/stateDefinitions.factory.js | 6 +++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js index 3bcdece9f6..e84b78face 100644 --- a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js +++ b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js @@ -15,7 +15,8 @@ export default ['templateUrl', '$state', usersDataset: '=', teamsDataset: '=', resourceData: '=', - withoutTeamPermissions: '@' + withoutTeamPermissions: '@', + title: '@' }, controller: controller, templateUrl: templateUrl('access/add-rbac-resource/rbac-resource'), diff --git a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html index f138e108d0..5cd8e19b1e 100644 --- a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html +++ b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html @@ -8,7 +8,7 @@
{{ object.name || object.username }}
- Add Permissions + {{ title }}
diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.directive.js b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.directive.js index ced1ceb744..ea4aafd2f3 100644 --- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.directive.js +++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.directive.js @@ -11,7 +11,8 @@ export default ['templateUrl', return { restrict: 'E', scope: { - resolve: "=" + resolve: "=", + title: "@", }, controller: controller, templateUrl: templateUrl('access/add-rbac-user-team/rbac-user-team'), diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html index a89621eda8..bc30eff1b7 100644 --- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html +++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html @@ -9,7 +9,7 @@
{{ owner.name || owner.username }}
- Add Permissions + {{ title }}
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js index 65cd07d475..96e7493598 100644 --- a/awx/ui/client/src/shared/stateDefinitions.factory.js +++ b/awx/ui/client/src/shared/stateDefinitions.factory.js @@ -267,7 +267,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat }, views: { [`modal@${formStateDefinition.name}`]: { - template: `` + template: `` } }, resolve: { @@ -332,7 +332,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat }, views: { [`modal@${formStateDefinition.name}`]: { - template: `` + template: `` } }, resolve: { @@ -501,7 +501,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat }, views: { [`modal@${formStateDefinition.name}`]: { - template: `` + template: `` } }, resolve: {