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

Merge pull request #1 from jlmitch5/ui_can_CRUD

Browse Source 
Conditionally hide the UI based on user permissions
This commit is contained in:
jlmitch5
2016-09-15 15:36:50 -04:00
committed by GitHub
parent 0cb9ab3cf4 2482f6c46b
commit 43f1ae3dc3
62 changed files with 856 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/access/roleList.partial.html
View File

@@ -1,13 +1,13 @@
<div class="RoleList-tagContainer" <div class="RoleList-tagContainer"
ng-repeat="entry in access_list"> ng-repeat="entry in access_list">
<div class="RoleList-deleteContainer" <div class="RoleList-deleteContainer"
ng-if="entry.explicit" ng-if="entry.explicit && entry.user_capabilities.unattach"
ng-click="deletePermission(permission, entry)"> ng-click="deletePermission(permission, entry)">
<i ng-if="entry.explicit" <i ng-if="entry.explicit && entry.user_capabilities.unattach"
class="fa fa-times RoleList-tagDelete"></i> class="fa fa-times RoleList-tagDelete"></i>
</div> </div>
<div class="RoleList-tag" <div class="RoleList-tag"
ng-class="{'RoleList-tag--deletable': entry.explicit, ng-class="{'RoleList-tag--deletable': entry.explicit && entry.user_capabilities.unattach,
'RoleList-tag--team': entry.team_id}" 'RoleList-tag--team': entry.team_id}"
aw-tool-tip='{{entry.team_name | sanitize}}' aw-tip-placement='bottom'> aw-tool-tip='{{entry.team_name | sanitize}}' aw-tip-placement='bottom'>
<span class="RoleList-name">{{ entry.name }}</span> <span class="RoleList-name">{{ entry.name }}</span>

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

@@ -839,6 +839,7 @@ var tower = angular.module('Tower', [
// If browser refresh, set the user_is_superuser value // If browser refresh, set the user_is_superuser value
$rootScope.user_is_superuser = Authorization.getUserInfo('is_superuser'); $rootScope.user_is_superuser = Authorization.getUserInfo('is_superuser');
$rootScope.user_is_system_auditor = Authorization.getUserInfo('is_system_auditor'); $rootScope.user_is_system_auditor = Authorization.getUserInfo('is_system_auditor');
// state the user refreshes we want to open the socket, except if the user is on the login page, which should happen after the user logs in (see the AuthService module for that call to OpenSocket) // state the user refreshes we want to open the socket, except if the user is on the login page, which should happen after the user logs in (see the AuthService module for that call to OpenSocket)
if (!_.contains($location.$$url, '/login')) { if (!_.contains($location.$$url, '/login')) {
ConfigService.getConfig().then(function() { ConfigService.getConfig().then(function() {

3
awx/ui/client/src/controllers/Credentials.js
View File

@@ -138,7 +138,6 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log,
ReturnToCaller, ClearScope, GenerateList, SearchInit, PaginateInit, ReturnToCaller, ClearScope, GenerateList, SearchInit, PaginateInit,
LookUpInit, OrganizationList, GetBasePath, GetChoices, Empty, KindChange, LookUpInit, OrganizationList, GetBasePath, GetChoices, Empty, KindChange,
OwnerChange, FormSave, $state, CreateSelect2) { OwnerChange, FormSave, $state, CreateSelect2) {
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view
@@ -337,6 +336,7 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
} }
ClearScope(); ClearScope();
var defaultUrl = GetBasePath('credentials'), var defaultUrl = GetBasePath('credentials'),
generator = GenerateForm, generator = GenerateForm,
form = CredentialForm, form = CredentialForm,
@@ -344,6 +344,7 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
master = {}, master = {},
id = $stateParams.credential_id, id = $stateParams.credential_id,
relatedSets = {}; relatedSets = {};
generator.inject(form, { mode: 'edit', related: true, scope: $scope }); generator.inject(form, { mode: 'edit', related: true, scope: $scope });
generator.reset(); generator.reset();
$scope.id = id; $scope.id = id;

9
awx/ui/client/src/controllers/Jobs.js
View File

@@ -13,7 +13,7 @@
export function JobsListController ($rootScope, $log, $scope, $compile, $stateParams, export function JobsListController ($rootScope, $log, $scope, $compile, $stateParams,
ClearScope, LoadSchedulesScope, ClearScope, LoadSchedulesScope,
LoadJobsScope, AllJobsList, ScheduledJobsList, GetChoices, GetBasePath, Wait) { LoadJobsScope, AllJobsList, ScheduledJobsList, GetChoices, GetBasePath, Wait, $state) {
ClearScope(); ClearScope();
@@ -61,6 +61,11 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
} }
} }
jobs_scope = $scope.$new(true); jobs_scope = $scope.$new(true);
jobs_scope.viewJob = function (id) {
$state.transitionTo('jobDetail', {id: id});
};
jobs_scope.showJobType = true; jobs_scope.showJobType = true;
LoadJobsScope({ LoadJobsScope({
parent_scope: $scope, parent_scope: $scope,
@@ -153,4 +158,4 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
JobsListController.$inject = ['$rootScope', '$log', '$scope', '$compile', '$stateParams', JobsListController.$inject = ['$rootScope', '$log', '$scope', '$compile', '$stateParams',
'ClearScope', 'LoadSchedulesScope', 'LoadJobsScope', 'ClearScope', 'LoadSchedulesScope', 'LoadJobsScope',
'AllJobsList', 'ScheduledJobsList', 'GetChoices', 'GetBasePath', 'Wait']; 'AllJobsList', 'ScheduledJobsList', 'GetChoices', 'GetBasePath', 'Wait', '$state'];

21
awx/ui/client/src/controllers/Projects.js
View File

@@ -15,10 +15,16 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit, Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit,
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
SelectionInit, ProjectUpdate, Refresh, Wait, GetChoices, Empty, SelectionInit, ProjectUpdate, Refresh, Wait, GetChoices, Empty,
Find, GetProjectIcon, GetProjectToolTip, $filter, $state) { Find, GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService) {
ClearScope(); ClearScope();
$scope.canAdd = false;
rbacUiControlService.canAdd('projects')
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
Wait('start'); Wait('start');
var list = ProjectList, var list = ProjectList,
@@ -369,7 +375,7 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate',
'Refresh', 'Wait', 'GetChoices', 'Empty', 'Find', 'Refresh', 'Wait', 'GetChoices', 'Empty', 'Find',
'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state' 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService'
]; ];
@@ -379,6 +385,15 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
OrganizationList, CredentialList, GetChoices, DebugForm, Wait, $state, OrganizationList, CredentialList, GetChoices, DebugForm, Wait, $state,
CreateSelect2) { CreateSelect2) {
Rest.setUrl(GetBasePath('projects'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a project.', 'alert-info');
}
});
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view

21
awx/ui/client/src/controllers/Teams.js
View File

@@ -14,10 +14,16 @@
export function TeamsList($scope, $rootScope, $location, $log, $stateParams, export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit, Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath, ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath,
SelectionInit, Wait, $state, Refresh, $filter) { SelectionInit, Wait, $state, Refresh, $filter, rbacUiControlService) {
ClearScope(); ClearScope();
$scope.canAdd = false;
rbacUiControlService.canAdd('teams')
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
var list = TeamList, var list = TeamList,
defaultUrl = GetBasePath('teams'), defaultUrl = GetBasePath('teams'),
generator = GenerateList, generator = GenerateList,
@@ -126,7 +132,7 @@ TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt', '$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait', 'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait',
'$state', 'Refresh', '$filter' '$state', 'Refresh', '$filter', 'rbacUiControlService'
]; ];
@@ -137,6 +143,15 @@ export function TeamsAdd($scope, $rootScope, $compile, $location, $log,
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
//$scope. //$scope.
Rest.setUrl(GetBasePath('teams'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a team.', 'alert-info');
}
});
// Inject dynamic view // Inject dynamic view
var defaultUrl = GetBasePath('teams'), var defaultUrl = GetBasePath('teams'),
form = TeamForm, form = TeamForm,

21
awx/ui/client/src/controllers/Users.js
View File

@@ -34,10 +34,16 @@ function user_type_sync($scope) {
export function UsersList($scope, $rootScope, $location, $log, $stateParams, export function UsersList($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit, Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
Wait, $state, Refresh, $filter) { Wait, $state, Refresh, $filter, rbacUiControlService) {
ClearScope(); ClearScope();
$scope.canAdd = false;
rbacUiControlService.canAdd('users')
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
var list = UserList, var list = UserList,
defaultUrl = GetBasePath('users'), defaultUrl = GetBasePath('users'),
generator = GenerateList, generator = GenerateList,
@@ -136,7 +142,7 @@ UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt', '$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$state', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$state',
'Refresh', '$filter' 'Refresh', '$filter', 'rbacUiControlService'
]; ];
@@ -148,6 +154,15 @@ export function UsersAdd($scope, $rootScope, $compile, $location, $log,
ReturnToCaller, ClearScope, GetBasePath, LookUpInit, OrganizationList, ReturnToCaller, ClearScope, GetBasePath, LookUpInit, OrganizationList,
ResetForm, Wait, CreateSelect2, $state) { ResetForm, Wait, CreateSelect2, $state) {
Rest.setUrl(GetBasePath('users'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a user.', 'alert-info');
}
});
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view

83
awx/ui/client/src/forms/Credentials.js
View File

@@ -32,13 +32,15 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
autocomplete: false autocomplete: false,
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
addRequired: false, addRequired: false,
@@ -52,7 +54,8 @@ export default
awPopOver: "<p>If no organization is given, the credential can only be used by the user that creates the credential. Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.</p>", awPopOver: "<p>If no organization is given, the credential can only be used by the user that creates the credential. Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.</p>",
dataTitle: 'Organization ', dataTitle: 'Organization ',
dataPlacement: 'bottom', dataPlacement: 'bottom',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
kind: { kind: {
label: 'Type', label: 'Type',
@@ -83,7 +86,8 @@ export default
dataTitle: 'Type', dataTitle: 'Type',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
hasSubForm: true hasSubForm: true,
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
access_key: { access_key: {
label: 'Access Key', label: 'Access Key',
@@ -96,12 +100,13 @@ export default
autocomplete: false, autocomplete: false,
apiField: 'username', apiField: 'username',
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
secret_key: { secret_key: {
label: 'Secret Key', label: 'Secret Key',
type: 'sensitive', type: 'sensitive',
ngShow: "kind.value == 'aws'", ngShow: "kind.value == 'aws'",
ngDisabled: "secret_key_ask", ngDisabled: "secret_key_ask || !credential_obj.summary_fields.user_capabilities.edit",
awRequiredWhen: { awRequiredWhen: {
reqExpression: "aws_required", reqExpression: "aws_required",
init: false init: false
@@ -123,7 +128,8 @@ export default
dataTitle: 'STS Token', dataTitle: 'STS Token',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"host": { "host": {
labelBind: 'hostLabel', labelBind: 'hostLabel',
@@ -139,7 +145,8 @@ export default
reqExpression: 'host_required', reqExpression: 'host_required',
init: false init: false
}, },
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"subscription": { "subscription": {
label: "Subscription ID", label: "Subscription ID",
@@ -156,7 +163,8 @@ export default
dataTitle: 'Subscription ID', dataTitle: 'Subscription ID',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"username": { "username": {
labelBind: 'usernameLabel', labelBind: 'usernameLabel',
@@ -168,7 +176,8 @@ export default
init: false init: false
}, },
autocomplete: false, autocomplete: false,
subForm: "credentialSubForm" subForm: "credentialSubForm",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"email_address": { "email_address": {
labelBind: 'usernameLabel', labelBind: 'usernameLabel',
@@ -183,7 +192,8 @@ export default
dataTitle: 'Email', dataTitle: 'Email',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"api_key": { "api_key": {
label: 'API Key', label: 'API Key',
@@ -196,7 +206,8 @@ export default
autocomplete: false, autocomplete: false,
hasShowInputButton: true, hasShowInputButton: true,
clear: false, clear: false,
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"password": { "password": {
labelBind: 'passwordLabel', labelBind: 'passwordLabel',
@@ -209,13 +220,14 @@ export default
reqExpression: "password_required", reqExpression: "password_required",
init: false init: false
}, },
subForm: "credentialSubForm" subForm: "credentialSubForm",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"ssh_password": { "ssh_password": {
label: 'Password', label: 'Password',
type: 'sensitive', type: 'sensitive',
ngShow: "kind.value == 'ssh'", ngShow: "kind.value == 'ssh'",
ngDisabled: "ssh_password_ask", ngDisabled: "ssh_password_ask || !credential_obj.summary_fields.user_capabilities.edit",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subCheckbox: { subCheckbox: {
@@ -247,7 +259,8 @@ export default
dataTitle: 'Private Key', dataTitle: 'Private Key',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subForm: "credentialSubForm" subForm: "credentialSubForm",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"ssh_key_unlock": { "ssh_key_unlock": {
label: 'Private Key Passphrase', label: 'Private Key Passphrase',
@@ -255,7 +268,7 @@ export default
ngShow: "kind.value == 'ssh' || kind.value == 'scm'", ngShow: "kind.value == 'ssh' || kind.value == 'scm'",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
ngDisabled: "keyEntered === false || ssh_key_unlock_ask", ngDisabled: "keyEntered === false || ssh_key_unlock_ask || !credential_obj.summary_fields.user_capabilities.edit",
subCheckbox: { subCheckbox: {
variable: 'ssh_key_unlock_ask', variable: 'ssh_key_unlock_ask',
ngShow: "kind.value == 'ssh'", ngShow: "kind.value == 'ssh'",
@@ -278,7 +291,8 @@ export default
"<code>sudo | su | pbrun | pfexec | runas</code> <br>(defaults to <code>sudo</code>)</p>", "<code>sudo | su | pbrun | pfexec | runas</code> <br>(defaults to <code>sudo</code>)</p>",
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"become_username": { "become_username": {
labelBind: 'becomeUsernameLabel', labelBind: 'becomeUsernameLabel',
@@ -287,13 +301,14 @@ export default
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
autocomplete: false, autocomplete: false,
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"become_password": { "become_password": {
labelBind: 'becomePasswordLabel', labelBind: 'becomePasswordLabel',
type: 'sensitive', type: 'sensitive',
ngShow: "(kind.value == 'ssh' && (become_method && become_method.value)) ", ngShow: "(kind.value == 'ssh' && (become_method && become_method.value)) ",
ngDisabled: "become_password_ask", ngDisabled: "become_password_ask || !credential_obj.summary_fields.user_capabilities.edit",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subCheckbox: { subCheckbox: {
@@ -309,7 +324,8 @@ export default
type: 'text', type: 'text',
label: 'Client ID', label: 'Client ID',
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
secret:{ secret:{
type: 'sensitive', type: 'sensitive',
@@ -317,20 +333,23 @@ export default
autocomplete: false, autocomplete: false,
label: 'Client Secret', label: 'Client Secret',
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
tenant: { tenant: {
type: 'text', type: 'text',
label: 'Tenant ID', label: 'Tenant ID',
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
authorize: { authorize: {
label: 'Authorize', label: 'Authorize',
type: 'checkbox', type: 'checkbox',
ngChange: "toggleCallback('host_config_key')", ngChange: "toggleCallback('host_config_key')",
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'net'" ngShow: "kind.value === 'net'",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
authorize_password: { authorize_password: {
label: 'Authorize Password', label: 'Authorize Password',
@@ -339,6 +358,7 @@ export default
autocomplete: false, autocomplete: false,
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "authorize && authorize !== 'false'", ngShow: "authorize && authorize !== 'false'",
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"project": { "project": {
labelBind: 'projectLabel', labelBind: 'projectLabel',
@@ -355,7 +375,8 @@ export default
reqExpression: 'project_required', reqExpression: 'project_required',
init: false init: false
}, },
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"domain": { "domain": {
labelBind: 'domainLabel', labelBind: 'domainLabel',
@@ -371,13 +392,14 @@ export default
dataContainer: "body", dataContainer: "body",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subForm: 'credentialSubForm' subForm: 'credentialSubForm',
ngDisabled: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
"vault_password": { "vault_password": {
label: "Vault Password", label: "Vault Password",
type: 'sensitive', type: 'sensitive',
ngShow: "kind.value == 'ssh'", ngShow: "kind.value == 'ssh'",
ngDisabled: "vault_password_ask", ngDisabled: "vault_password_ask || !credential_obj.summary_fields.user_capabilities.edit",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subCheckbox: { subCheckbox: {
@@ -394,11 +416,17 @@ export default
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()', ngClick: 'formCancel()',
ngShow: 'credential_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!credential_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
label: 'Save', label: 'Save',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true,
ngShow: 'credential_obj.summary_fields.user_capabilities.edit' //Disable when $pristine or $invalid, optional
} }
}, },
@@ -421,7 +449,8 @@ export default
label: 'Add', label: 'Add',
awToolTip: 'Add a permission', awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'credential_obj.summary_fields.user_capabilities.edit'
} }
}, },

41
awx/ui/client/src/forms/Groups.js
View File

@@ -26,14 +26,16 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
tab: 'properties' tab: 'properties',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
tab: 'properties' tab: 'properties',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
variables: { variables: {
label: 'Variables', label: 'Variables',
@@ -65,7 +67,8 @@ export default
ngChange: 'sourceChange(source)', ngChange: 'sourceChange(source)',
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
ngModel: 'source' ngModel: 'source',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
credential: { credential: {
label: 'Cloud Credential', label: 'Cloud Credential',
@@ -77,7 +80,8 @@ export default
awRequiredWhen: { awRequiredWhen: {
reqExpression: "cloudCredentialRequired", reqExpression: "cloudCredentialRequired",
init: "false" init: "false"
} },
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
source_regions: { source_regions: {
label: 'Regions', label: 'Regions',
@@ -92,7 +96,8 @@ export default
awPopOver: "<p>Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " + awPopOver: "<p>Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " +
"or choose <em>All</em> to include all regions. Tower will only be updated with Hosts associated with the selected regions." + "or choose <em>All</em> to include all regions. Tower will only be updated with Hosts associated with the selected regions." +
"</p>", "</p>",
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
instance_filters: { instance_filters: {
label: 'Instance Filters', label: 'Instance Filters',
@@ -112,7 +117,8 @@ export default
"<blockquote>tag:Name=test*</blockquote>\n" + "<blockquote>tag:Name=test*</blockquote>\n" +
"<p>View the <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html\" target=\"_blank\">Describe Instances documentation</a> " + "<p>View the <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html\" target=\"_blank\">Describe Instances documentation</a> " +
"for a complete list of supported filters.</p>", "for a complete list of supported filters.</p>",
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
group_by: { group_by: {
label: 'Only Group By', label: 'Only Group By',
@@ -137,7 +143,8 @@ export default
"<li>VPC ID: <strong>vpcs &raquo; vpc-5ca1ab1e</strong></li>" + "<li>VPC ID: <strong>vpcs &raquo; vpc-5ca1ab1e</strong></li>" +
"<li>Tag None: <strong>tags &raquo; tag_none</strong></li>" + "<li>Tag None: <strong>tags &raquo; tag_none</strong></li>" +
"</ul><p>If blank, all groups above are created except <em>Instance ID</em>.</p>", "</ul><p>If blank, all groups above are created except <em>Instance ID</em>.</p>",
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, },
inventory_script: { inventory_script: {
label : "Custom Inventory Script", label : "Custom Inventory Script",
@@ -149,6 +156,7 @@ export default
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
ngRequired: "source && source.value === 'custom'", ngRequired: "source && source.value === 'custom'",
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit',
}, },
custom_variables: { custom_variables: {
id: 'custom_variables', id: 'custom_variables',
@@ -269,7 +277,8 @@ export default
dataTitle: 'Overwrite', dataTitle: 'Overwrite',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options' labelClass: 'checkbox-options',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, { }, {
name: 'overwrite_vars', name: 'overwrite_vars',
label: 'Overwrite Variables', label: 'Overwrite Variables',
@@ -283,7 +292,8 @@ export default
dataTitle: 'Overwrite Variables', dataTitle: 'Overwrite Variables',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options' labelClass: 'checkbox-options',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}, { }, {
name: 'update_on_launch', name: 'update_on_launch',
label: 'Update on Launch', label: 'Update on Launch',
@@ -296,7 +306,8 @@ export default
dataTitle: 'Update on Launch', dataTitle: 'Update on Launch',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options' labelClass: 'checkbox-options',
ngDisabled: '!group_obj.summary_fields.user_capabilities.edit'
}] }]
}, },
update_cache_timeout: { update_cache_timeout: {
@@ -321,11 +332,17 @@ export default
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'group_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!group_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'group_obj.summary_fields.user_capabilities.edit'
} }
}, },

14
awx/ui/client/src/forms/Hosts.js
View File

@@ -46,13 +46,15 @@ export default
"</blockquote>", "</blockquote>",
dataTitle: 'Host Name', dataTitle: 'Host Name',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!host.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!host.summary_fields.user_capabilities.edit'
}, },
variables: { variables: {
label: 'Variables', label: 'Variables',
@@ -83,10 +85,16 @@ export default
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()', ngClick: 'formCancel()',
ngShow: 'host.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!host.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'host.summary_fields.user_capabilities.edit'
} }
}, },

25
awx/ui/client/src/forms/Inventories.js
View File

@@ -26,14 +26,16 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!inventory_obj.summary_fields.user_capabilities.edit'
}, },
inventory_description: { inventory_description: {
realName: 'description', realName: 'description',
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!inventory_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -44,7 +46,8 @@ export default
awRequiredWhen: { awRequiredWhen: {
reqExpression: "organizationrequired", reqExpression: "organizationrequired",
init: "true" init: "true"
} },
ngDisabled: '!inventory_obj.summary_fields.user_capabilities.edit'
}, },
variables: { variables: {
label: 'Variables', label: 'Variables',
@@ -63,17 +66,24 @@ export default
'<p>View YAML examples at <a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>', '<p>View YAML examples at <a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
dataTitle: 'Inventory Variables', dataTitle: 'Inventory Variables',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!inventory_obj.summary_fields.user_capabilities.edit' // TODO: get working
} }
}, },
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'inventory_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngHide: 'inventory_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'inventory_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -94,7 +104,8 @@ export default
label: 'Add', label: 'Add',
awToolTip: 'Add a permission', awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'inventory_obj.summary_fields.user_capabilities.edit'
} }
}, },

79
awx/ui/client/src/forms/JobTemplates.js
View File

@@ -27,14 +27,16 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
column: 1 column: 1,
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
column: 1 column: 1,
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
job_type: { job_type: {
label: 'Job Type', label: 'Job Type',
@@ -56,7 +58,8 @@ export default
variable: 'ask_job_type_on_launch', variable: 'ask_job_type_on_launch',
ngShow: "!job_type.value || job_type.value !== 'scan'", ngShow: "!job_type.value || job_type.value !== 'scan'",
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
inventory: { inventory: {
label: 'Inventory', label: 'Inventory',
@@ -78,7 +81,8 @@ export default
variable: 'ask_inventory_on_launch', variable: 'ask_inventory_on_launch',
ngShow: "!job_type.value || job_type.value !== 'scan'", ngShow: "!job_type.value || job_type.value !== 'scan'",
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
project: { project: {
label: 'Project', label: 'Project',
@@ -100,12 +104,13 @@ export default
dataTitle: 'Project', dataTitle: 'Project',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
playbook: { playbook: {
label: 'Playbook', label: 'Playbook',
type:'select', type:'select',
ngOptions: 'book for book in playbook_options track by book', ngOptions: 'book for book in playbook_options track by book',
ngDisabled: "job_type.value === 'scan' && project_name === 'Default'", ngDisabled: "(job_type.value === 'scan' && project_name === 'Default') || !job_template_obj.summary_fields.user_capabilities.edit",
id: 'playbook-select', id: 'playbook-select',
awRequiredWhen: { awRequiredWhen: {
reqExpression: "playbookrequired", reqExpression: "playbookrequired",
@@ -138,7 +143,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ask_credential_on_launch', variable: 'ask_credential_on_launch',
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
cloud_credential: { cloud_credential: {
label: 'Cloud Credential', label: 'Cloud Credential',
@@ -153,7 +159,8 @@ export default
"running playbook, allowing provisioning into the cloud without manually passing parameters to the included modules.</p>", "running playbook, allowing provisioning into the cloud without manually passing parameters to the included modules.</p>",
dataTitle: 'Cloud Credential', dataTitle: 'Cloud Credential',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
network_credential: { network_credential: {
label: 'Network Credential', label: 'Network Credential',
@@ -167,7 +174,8 @@ export default
awPopOver: "<p>Network credentials are used by Ansible networking modules to connect to and manage networking devices.</p>", awPopOver: "<p>Network credentials are used by Ansible networking modules to connect to and manage networking devices.</p>",
dataTitle: 'Network Credential', dataTitle: 'Network Credential',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
forks: { forks: {
label: 'Forks', label: 'Forks',
@@ -186,7 +194,8 @@ export default
' target=\"_blank\">ansible configuration file</a>.</p>', ' target=\"_blank\">ansible configuration file</a>.</p>',
dataTitle: 'Forks', dataTitle: 'Forks',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit' // TODO: get working
}, },
limit: { limit: {
label: 'Limit', label: 'Limit',
@@ -203,7 +212,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ask_limit_on_launch', variable: 'ask_limit_on_launch',
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
verbosity: { verbosity: {
label: 'Verbosity', label: 'Verbosity',
@@ -216,7 +226,8 @@ export default
awPopOver: "<p>Control the level of output ansible will produce as the playbook executes.</p>", awPopOver: "<p>Control the level of output ansible will produce as the playbook executes.</p>",
dataTitle: 'Verbosity', dataTitle: 'Verbosity',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
job_tags: { job_tags: {
label: 'Job Tags', label: 'Job Tags',
@@ -235,7 +246,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ask_tags_on_launch', variable: 'ask_tags_on_launch',
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
skip_tags: { skip_tags: {
label: 'Skip Tags', label: 'Skip Tags',
@@ -254,7 +266,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ask_skip_tags_on_launch', variable: 'ask_skip_tags_on_launch',
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
checkbox_group: { checkbox_group: {
label: 'Options', label: 'Options',
@@ -270,7 +283,8 @@ export default
dataPlacement: 'right', dataPlacement: 'right',
dataTitle: 'Become Privilege Escalation', dataTitle: 'Become Privilege Escalation',
dataContainer: "body", dataContainer: "body",
labelClass: 'stack-inline' labelClass: 'stack-inline',
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, { }, {
name: 'allow_callbacks', name: 'allow_callbacks',
label: 'Allow Provisioning Callbacks', label: 'Allow Provisioning Callbacks',
@@ -284,7 +298,8 @@ export default
dataPlacement: 'right', dataPlacement: 'right',
dataTitle: 'Allow Provisioning Callbacks', dataTitle: 'Allow Provisioning Callbacks',
dataContainer: "body", dataContainer: "body",
labelClass: 'stack-inline' labelClass: 'stack-inline',
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}] }]
}, },
callback_url: { callback_url: {
@@ -299,7 +314,8 @@ export default
awPopOverWatch: "callback_help", awPopOverWatch: "callback_help",
dataPlacement: 'top', dataPlacement: 'top',
dataTitle: 'Provisioning Callback URL', dataTitle: 'Provisioning Callback URL',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
host_config_key: { host_config_key: {
label: 'Host Config Key', label: 'Host Config Key',
@@ -312,7 +328,8 @@ export default
awPopOverWatch: "callback_help", awPopOverWatch: "callback_help",
dataPlacement: 'right', dataPlacement: 'right',
dataTitle: "Host Config Key", dataTitle: "Host Config Key",
dataContainer: "body" dataContainer: "body",
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
labels: { labels: {
label: 'Labels', label: 'Labels',
@@ -325,7 +342,8 @@ export default
dataTitle: 'Labels', dataTitle: 'Labels',
dataPlacement: 'right', dataPlacement: 'right',
awPopOver: "<p>Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.</p>", awPopOver: "<p>Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.</p>",
dataContainer: 'body' dataContainer: 'body',
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
variables: { variables: {
label: 'Extra Variables', label: 'Extra Variables',
@@ -348,14 +366,15 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ask_variables_on_launch', variable: 'ask_variables_on_launch',
text: 'Prompt on launch' text: 'Prompt on launch'
} },
ngDisabled: '!job_template_obj.summary_fields.user_capabilities.edit' // TODO: get working
} }
}, },
buttons: { //for now always generates <button> tags buttons: { //for now always generates <button> tags
add_survey: { add_survey: {
ngClick: 'addSurvey()', ngClick: 'addSurvey()',
ngShow: 'job_type.value !== "scan" && !survey_exists', ngShow: 'job_type.value !== "scan" && !survey_exists && job_template_obj.summary_fields.user_capabilities.edit',
awFeature: 'surveys', awFeature: 'surveys',
awToolTip: 'Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch.', awToolTip: 'Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch.',
dataPlacement: 'top' dataPlacement: 'top'
@@ -363,14 +382,25 @@ export default
edit_survey: { edit_survey: {
ngClick: 'editSurvey()', ngClick: 'editSurvey()',
awFeature: 'surveys', awFeature: 'surveys',
ngShow: 'job_type.value !== "scan" && survey_exists' ngShow: 'job_type.value !== "scan" && survey_exists && job_template_obj.summary_fields.user_capabilities.edit'
},
view_survey: {
ngClick: 'editSurvey()',
awFeature: 'surveys',
ngShow: 'job_type.value !== "scan" && survey_exists && !job_template_obj.summary_fields.user_capabilities.edit'
}, },
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'job_template_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!job_template_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: "job_templates_form.$invalid || can_edit!==true"//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons ngDisabled: "job_templates_form.$invalid || can_edit!==true",//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
ngShow: 'job_template_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -394,7 +424,8 @@ export default
label: 'Add', label: 'Add',
awToolTip: 'Add a permission', awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'job_template_obj.summary_fields.user_capabilities.edit'
} }
}, },

19
awx/ui/client/src/forms/Organizations.js
View File

@@ -25,23 +25,31 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!organization_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!organization_obj.summary_fields.user_capabilities.edit'
} }
}, },
buttons: { //for now always generates <button> tags buttons: { //for now always generates <button> tags
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'organization_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!organization_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true,
ngShow: 'organization_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -62,7 +70,8 @@ export default
label: 'Add', label: 'Add',
awToolTip: 'Add a permission', awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'organization_obj.summary_fields.user_capabilities.edit'
} }
}, },

50
awx/ui/client/src/forms/Projects.js
View File

@@ -30,13 +30,15 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -50,7 +52,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
}, },
dataTitle: 'Organization', dataTitle: 'Organization',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right' dataPlacement: 'right',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
scm_type: { scm_type: {
label: 'SCM Type', label: 'SCM Type',
@@ -61,6 +64,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
hasSubForm: true, hasSubForm: true,
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
missing_path_alert: { missing_path_alert: {
type: 'alertblock', type: 'alertblock',
@@ -82,7 +86,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
'<p>Use PROJECTS_ROOT in your environment settings file to determine the base path value.</p>', '<p>Use PROJECTS_ROOT in your environment settings file to determine the base path value.</p>',
dataTitle: 'Project Base Path', dataTitle: 'Project Base Path',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right' dataPlacement: 'right',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
local_path: { local_path: {
label: 'Playbook Directory', label: 'Playbook Directory',
@@ -99,7 +104,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
'<p>Use PROJECTS_ROOT in your environment settings file to determine the base path value.</p>', '<p>Use PROJECTS_ROOT in your environment settings file to determine the base path value.</p>',
dataTitle: 'Project Path', dataTitle: 'Project Path',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right' dataPlacement: 'right',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
scm_url: { scm_url: {
label: 'SCM URL', label: 'SCM URL',
@@ -115,7 +121,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
awPopOver: "set in controllers/projects", awPopOver: "set in controllers/projects",
dataTitle: 'SCM URL', dataTitle: 'SCM URL',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right' dataPlacement: 'right',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
scm_branch: { scm_branch: {
labelBind: "scmBranchLabel", labelBind: "scmBranchLabel",
@@ -123,7 +130,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
ngShow: "scm_type && scm_type.value !== 'manual'", ngShow: "scm_type && scm_type.value !== 'manual'",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subForm: 'sourceSubForm' subForm: 'sourceSubForm',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
credential: { credential: {
label: 'SCM Credential', label: 'SCM Credential',
@@ -134,7 +142,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
ngClick: 'lookUpCredential()', ngClick: 'lookUpCredential()',
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
subForm: 'sourceSubForm' subForm: 'sourceSubForm',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, },
checkbox_group: { checkbox_group: {
label: 'SCM Update Options', label: 'SCM Update Options',
@@ -151,7 +160,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
dataTitle: 'SCM Clean', dataTitle: 'SCM Clean',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options stack-inline' labelClass: 'checkbox-options stack-inline',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, { }, {
name: 'scm_delete_on_update', name: 'scm_delete_on_update',
label: 'Delete on Update', label: 'Delete on Update',
@@ -163,7 +173,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
dataTitle: 'SCM Delete', dataTitle: 'SCM Delete',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options stack-inline' labelClass: 'checkbox-options stack-inline',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}, { }, {
name: 'scm_update_on_launch', name: 'scm_update_on_launch',
label: 'Update on Launch', label: 'Update on Launch',
@@ -174,7 +185,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
dataTitle: 'SCM Update', dataTitle: 'SCM Update',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
labelClass: 'checkbox-options stack-inline' labelClass: 'checkbox-options stack-inline',
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit'
}] }]
}, },
scm_update_cache_timeout: { scm_update_cache_timeout: {
@@ -193,17 +205,24 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
'and a new project update will be performed.</p>', 'and a new project update will be performed.</p>',
dataTitle: 'Cache Timeout', dataTitle: 'Cache Timeout',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body",
ngDisabled: '!project_obj.summary_fields.user_capabilities.edit' // TODO: get working
} }
}, },
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'project_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!project_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'project_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -224,7 +243,8 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
label: 'Add', label: 'Add',
awToolTip: 'Add a permission', awToolTip: 'Add a permission',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'project_obj.summary_fields.user_capabilities.edit'
} }
}, },

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

@@ -25,13 +25,15 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!team_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!team_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -44,17 +46,24 @@ export default
awRequiredWhen: { awRequiredWhen: {
reqExpression: "orgrequired", reqExpression: "orgrequired",
init: true init: true
} },
ngDisabled: '!team_obj.summary_fields.user_capabilities.edit'
} }
}, },
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'team_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!team_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'team_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -75,7 +84,8 @@ export default
label: 'Add', label: 'Add',
awToolTip: 'Add user to team', awToolTip: 'Add user to team',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'team_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -132,7 +142,8 @@ export default
'class': "List-actionButton--delete", 'class': "List-actionButton--delete",
iconClass: 'fa fa-times', iconClass: 'fa fa-times',
awToolTip: 'Dissasociate permission from team', awToolTip: 'Dissasociate permission from team',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'permission.summary_fields.user_capabilities.unattach'
} }
}, },
hideOnSuperuser: true hideOnSuperuser: true

35
awx/ui/client/src/forms/Users.js
View File

@@ -26,21 +26,24 @@ export default
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: true capitalize: true,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
last_name: { last_name: {
label: 'Last Name', label: 'Last Name',
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: true capitalize: true,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
email: { email: {
label: 'Email', label: 'Email',
type: 'email', type: 'email',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
autocomplete: false autocomplete: false,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
username: { username: {
label: 'Username', label: 'Username',
@@ -49,7 +52,8 @@ export default
reqExpression: "not_ldap_user && external_account === null", reqExpression: "not_ldap_user && external_account === null",
init: true init: true
}, },
autocomplete: false autocomplete: false,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -63,7 +67,8 @@ export default
awRequiredWhen: { awRequiredWhen: {
reqExpression: "orgrequired", reqExpression: "orgrequired",
init: true init: true
} },
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
password: { password: {
label: 'Password', label: 'Password',
@@ -74,7 +79,8 @@ export default
editRequired: false, editRequired: false,
ngChange: "clearPWConfirm('password_confirm')", ngChange: "clearPWConfirm('password_confirm')",
autocomplete: false, autocomplete: false,
chkPass: true chkPass: true,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
password_confirm: { password_confirm: {
label: 'Confirm Password', label: 'Confirm Password',
@@ -85,7 +91,8 @@ export default
editRequired: false, editRequired: false,
awPassMatch: true, awPassMatch: true,
associated: 'password', associated: 'password',
autocomplete: false autocomplete: false,
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
user_type: { user_type: {
label: 'User Type', label: 'User Type',
@@ -94,16 +101,23 @@ export default
disableChooseOption: true, disableChooseOption: true,
ngModel: 'user_type', ngModel: 'user_type',
ngShow: 'current_user["is_superuser"]', ngShow: 'current_user["is_superuser"]',
ngDisabled: '!user_obj.summary_fields.user_capabilities.edit'
}, },
}, },
buttons: { buttons: {
cancel: { cancel: {
ngClick: 'formCancel()' ngClick: 'formCancel()',
ngShow: 'user_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!user_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', ngClick: 'formSave()',
ngDisabled: true ngDisabled: true,
ngShow: 'user_obj.summary_fields.user_capabilities.edit'
} }
}, },
@@ -186,7 +200,8 @@ export default
label: 'Remove', label: 'Remove',
ngClick: 'deletePermissionFromUser(user_id, username, permission.name, permission.summary_fields.resource_name, permission.related.users)', ngClick: 'deletePermissionFromUser(user_id, username, permission.name, permission.summary_fields.resource_name, permission.related.users)',
iconClass: 'fa fa-times', iconClass: 'fa fa-times',
awToolTip: 'Dissasociate permission from user' awToolTip: 'Dissasociate permission from user',
ngShow: 'permission.summary_fields.user_capabilities.unattach'
} }
}, },
hideOnSuperuser: true hideOnSuperuser: true

2
awx/ui/client/src/helpers/Parse.js
View File

@@ -46,7 +46,7 @@ export default
function createField(onChange, onReady, fld) { function createField(onChange, onReady, fld) {
//hide the textarea and show a fresh CodeMirror with the current mode (json or yaml) //hide the textarea and show a fresh CodeMirror with the current mode (json or yaml)
scope[fld + 'codeMirror'] = AngularCodeMirror(); scope[fld + 'codeMirror'] = AngularCodeMirror(readOnly);
scope[fld + 'codeMirror'].addModes(global.$AnsibleConfig.variable_edit_modes); scope[fld + 'codeMirror'].addModes(global.$AnsibleConfig.variable_edit_modes);
scope[fld + 'codeMirror'].showTextArea({ scope[fld + 'codeMirror'].showTextArea({
scope: scope, scope: scope,

14
awx/ui/client/src/helpers/ProjectPath.js
View File

@@ -3,7 +3,7 @@
* *
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
/** /**
* @ngdoc function * @ngdoc function
* @name helpers.function:ProjectPath * @name helpers.function:ProjectPath
@@ -47,11 +47,13 @@ export default
Rest.get() Rest.get()
.success(function (data) { .success(function (data) {
var opts = [], i; var opts = [], i;
for (i = 0; i < data.project_local_paths.length; i++) { if (data.project_local_paths) {
opts.push({ for (i = 0; i < data.project_local_paths.length; i++) {
label: data.project_local_paths[i], opts.push({
value: data.project_local_paths[i] label: data.project_local_paths[i],
}); value: data.project_local_paths[i]
});
}
} }
if (scope.local_path) { if (scope.local_path) {
// List only includes paths not assigned to projects, so add the // List only includes paths not assigned to projects, so add the

9
awx/ui/client/src/inventories/add/inventory-add.controller.js
View File

@@ -16,6 +16,15 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON, PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON,
$state) { $state) {
Rest.setUrl(GetBasePath('inventory'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add an inventory.', 'alert-info');
}
});
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view

1
awx/ui/client/src/inventories/edit/inventory-edit.controller.js
View File

@@ -17,7 +17,6 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,
ParseVariableString, RelatedSearchInit, RelatedPaginateInit, ParseVariableString, RelatedSearchInit, RelatedPaginateInit,
Prompt, InitiatePlaybookRun, CreateDialog, deleteJobTemplate, $state, Prompt, InitiatePlaybookRun, CreateDialog, deleteJobTemplate, $state,
$filter) { $filter) {
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view

11
awx/ui/client/src/inventories/list/inventory-list.controller.js
View File

@@ -14,7 +14,14 @@ function InventoriesList($scope, $rootScope, $location, $log,
$stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList, $stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList,
generateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, generateList, Prompt, SearchInit, PaginateInit, ReturnToCaller,
ClearScope, ProcessErrors, GetBasePath, Wait, ClearScope, ProcessErrors, GetBasePath, Wait,
Find, Empty, $state) { Find, Empty, $state, rbacUiControlService) {
$scope.canAdd = false;
rbacUiControlService.canAdd('inventory')
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
var list = InventoryList, var list = InventoryList,
defaultUrl = GetBasePath('inventory') + ($stateParams.status === 'sync-failed' ? '?not__inventory_sources_with_failures=0' : ''), defaultUrl = GetBasePath('inventory') + ($stateParams.status === 'sync-failed' ? '?not__inventory_sources_with_failures=0' : ''),
@@ -376,4 +383,4 @@ function InventoriesList($scope, $rootScope, $location, $log,
export default ['$scope', '$rootScope', '$location', '$log', export default ['$scope', '$rootScope', '$location', '$log',
'$stateParams', '$compile', '$filter', 'sanitizeFilter', 'Rest', 'Alert', 'InventoryList', '$stateParams', '$compile', '$filter', 'sanitizeFilter', 'Rest', 'Alert', 'InventoryList',
'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller',
'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state', InventoriesList]; 'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state', 'rbacUiControlService', InventoriesList];

1
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -256,6 +256,7 @@
$scope.credential_name = inventorySourceData.summary_fields.credential.name; $scope.credential_name = inventorySourceData.summary_fields.credential.name;
} }
$scope = angular.extend($scope, groupData); $scope = angular.extend($scope, groupData);
$scope.group_obj = groupData;
// instantiate lookup fields // instantiate lookup fields
if (inventorySourceData.source !== 'custom'){ if (inventorySourceData.source !== 'custom'){

13
awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
View File

@@ -5,13 +5,22 @@
*************************************************/ *************************************************/
export default export default
['$scope', '$rootScope', '$state', '$stateParams', 'InventoryGroups', 'generateList', 'InventoryUpdate', 'GroupManageService', 'GroupsCancelUpdate', 'ViewUpdateStatus', ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryGroups', 'generateList', 'InventoryUpdate', 'GroupManageService', 'GroupsCancelUpdate', 'ViewUpdateStatus',
'InventoryManageService', 'groupsUrl', 'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg', 'InventoryManageService', 'groupsUrl', 'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg', 'Rest', 'GetBasePath', 'rbacUiControlService',
function($scope, $rootScope, $state, $stateParams, InventoryGroups, generateList, InventoryUpdate, GroupManageService, GroupsCancelUpdate, ViewUpdateStatus, function($scope, $rootScope, $state, $stateParams, InventoryGroups, generateList, InventoryUpdate, GroupManageService, GroupsCancelUpdate, ViewUpdateStatus,
InventoryManageService, groupsUrl, SearchInit, PaginateInit, GetSyncStatusMsg, GetHostsStatusMsg){ InventoryManageService, groupsUrl, SearchInit, PaginateInit, GetSyncStatusMsg, GetHostsStatusMsg, Rest, GetBasePath, rbacUiControlService){
var list = InventoryGroups, var list = InventoryGroups,
view = generateList, view = generateList,
pageSize = 20; pageSize = 20;
$scope.inventory_id = $stateParams.inventory_id; $scope.inventory_id = $stateParams.inventory_id;
$scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/groups")
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
// The ncy breadcrumb directive will look at this attribute when attempting to bind to the correct scope. // The ncy breadcrumb directive will look at this attribute when attempting to bind to the correct scope.
// In this case, we don't want to incidentally bind to this scope when editing a host or a group. See: // In this case, we don't want to incidentally bind to this scope when editing a host or a group. See:
// https://github.com/ncuillery/angular-breadcrumb/issues/42 for a little more information on the // https://github.com/ncuillery/angular-breadcrumb/issues/42 for a little more information on the

4
awx/ui/client/src/inventories/manage/hosts/hosts-edit.controller.js
View File

@@ -5,8 +5,8 @@
*************************************************/ *************************************************/
export default export default
['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange', 'GenerateForm', 'HostManageService', 'host', ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange', 'GenerateForm', 'HostManageService', 'host', 'GetBasePath', 'Rest',
function($state, $stateParams, $scope, HostForm, ParseTypeChange, GenerateForm, HostManageService, host){ function($state, $stateParams, $scope, HostForm, ParseTypeChange, GenerateForm, HostManageService, host, GetBasePath, Rest){
var generator = GenerateForm, var generator = GenerateForm,
form = HostForm; form = HostForm;
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';

15
awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
View File

@@ -5,12 +5,23 @@
*************************************************/ *************************************************/
export default export default
['$scope', '$rootScope', '$state', '$stateParams', 'InventoryHosts', 'generateList', 'InventoryManageService', 'HostManageService', ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryHosts', 'generateList', 'InventoryManageService', 'HostManageService',
'hostsUrl', 'SearchInit', 'PaginateInit', 'SetStatus', 'Prompt', 'Wait', 'inventoryData', '$filter', 'hostsUrl', 'SearchInit', 'PaginateInit', 'SetStatus', 'Prompt', 'Wait', 'inventoryData', '$filter', 'Rest', 'GetBasePath', 'rbacUiControlService',
function($scope, $rootScope, $state, $stateParams, InventoryHosts, generateList, InventoryManageService, HostManageService, function($scope, $rootScope, $state, $stateParams, InventoryHosts, generateList, InventoryManageService, HostManageService,
hostsUrl, SearchInit, PaginateInit, SetStatus, Prompt, Wait, inventoryData, $filter){ hostsUrl, SearchInit, PaginateInit, SetStatus, Prompt, Wait, inventoryData, $filter, Rest, GetBasePath, rbacUiControlService){
var list = InventoryHosts, var list = InventoryHosts,
view = generateList, view = generateList,
pageSize = 20; pageSize = 20;
$scope.inventory_id = $stateParams.inventory_id;
$scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/hosts")
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
// The ncy breadcrumb directive will look at this attribute when attempting to bind to the correct scope. // The ncy breadcrumb directive will look at this attribute when attempting to bind to the correct scope.
// In this case, we don't want to incidentally bind to this scope when editing a host or a group. See: // In this case, we don't want to incidentally bind to this scope when editing a host or a group. See:
// https://github.com/ncuillery/angular-breadcrumb/issues/42 for a little more information on the // https://github.com/ncuillery/angular-breadcrumb/issues/42 for a little more information on the

35
awx/ui/client/src/inventories/manage/inventory-manage.controller.js
View File

@@ -3,21 +3,26 @@
* *
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default export default
['$scope', '$state', function($scope, $state){ ['$scope', '$state', 'inventoryData', function($scope, $state, inventoryData){
$scope.groupsSelected = false; $scope.groupsSelected = false;
$scope.hostsSelected = false; $scope.hostsSelected = false;
$scope.hostsSelectedItems = []; $scope.hostsSelectedItems = [];
$scope.groupsSelectedItems = []; $scope.groupsSelectedItems = [];
$scope.setAdhocPattern = function(){
var pattern = _($scope.groupsSelectedItems) $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc;
.concat($scope.hostsSelectedItems)
.map(function(item){ $scope.setAdhocPattern = function(){
return item.name; var pattern = _($scope.groupsSelectedItems)
}).value().join(':'); .concat($scope.hostsSelectedItems)
$state.go('inventoryManage.adhoc', {pattern: pattern}); .map(function(item){
}; return item.name;
}).value().join(':');
$state.go('inventoryManage.adhoc', {pattern: pattern});
};
$scope.$watchGroup(['groupsSelected', 'hostsSelected'], function(newVals) { $scope.$watchGroup(['groupsSelected', 'hostsSelected'], function(newVals) {
$scope.adhocCommandTooltip = (newVals[0] || newVals[1]) ? "Run a command on the selected inventory" : "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups."; $scope.adhocCommandTooltip = (newVals[0] || newVals[1]) ? "Run a command on the selected inventory" : "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.";
}); });
}]; }];

15
awx/ui/client/src/inventory-scripts/add/add.controller.js
View File

@@ -8,20 +8,27 @@ export default
[ '$rootScope', 'pagination', '$compile','SchedulerInit', 'Rest', 'Wait', [ '$rootScope', 'pagination', '$compile','SchedulerInit', 'Rest', 'Wait',
'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty', 'inventoryScriptsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty',
'GenerateForm', 'SearchInit' , 'PaginateInit', 'GenerateForm', 'SearchInit' , 'PaginateInit',
'LookUpInit', 'OrganizationList', '$scope', '$state', 'LookUpInit', 'OrganizationList', '$scope', '$state', 'Alert',
function( function(
$rootScope, pagination, $compile, SchedulerInit, Rest, Wait, $rootScope, pagination, $compile, SchedulerInit, Rest, Wait,
inventoryScriptsFormObject, ProcessErrors, GetBasePath, Empty, inventoryScriptsFormObject, ProcessErrors, GetBasePath, Empty,
GenerateForm, SearchInit, PaginateInit, GenerateForm, SearchInit, PaginateInit,
LookUpInit, OrganizationList, $scope, $state LookUpInit, OrganizationList, $scope, $state, Alert
) { ) {
Rest.setUrl(GetBasePath('inventory_scripts'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add an inventory script.', 'alert-info');
}
});
var scope = $scope, var scope = $scope,
generator = GenerateForm, generator = GenerateForm,
form = inventoryScriptsFormObject, form = inventoryScriptsFormObject,
url = GetBasePath('inventory_scripts'); url = GetBasePath('inventory_scripts');
$scope.canEdit = true;
generator.inject(form, { generator.inject(form, {
mode: 'add' , mode: 'add' ,
scope:scope, scope:scope,

1
awx/ui/client/src/inventory-scripts/edit/edit.controller.js
View File

@@ -17,6 +17,7 @@ export default
LookUpInit, OrganizationList, inventory_script, LookUpInit, OrganizationList, inventory_script,
$scope, $state $scope, $state
) { ) {
var generator = GenerateForm, var generator = GenerateForm,
id = inventory_script.id, id = inventory_script.id,
form = inventoryScriptsFormObject, form = inventoryScriptsFormObject,

19
awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
View File

@@ -24,13 +24,15 @@ export default function() {
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!inventory_script_obj.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!inventory_script_obj.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -41,7 +43,8 @@ export default function() {
}, },
sourceModel: 'organization', sourceModel: 'organization',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookUpOrganization()' ngClick: 'lookUpOrganization()',
ngDisabled: '!inventory_script_obj.summary_fields.user_capabilities.edit'
}, },
script: { script: {
label: 'Custom Script', label: 'Custom Script',
@@ -51,7 +54,7 @@ export default function() {
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
awDropFile: true, awDropFile: true,
ngDisabled: '!canEdit', ngDisabled: '!inventory_script_obj.summary_fields.user_capabilities.edit',
rows: 10, rows: 10,
awPopOver: "<p>Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. " + awPopOver: "<p>Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. " +
"<br><br> Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python</p>", "<br><br> Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python</p>",
@@ -64,10 +67,16 @@ export default function() {
buttons: { //for now always generates <button> tags buttons: { //for now always generates <button> tags
cancel: { cancel: {
ngClick: 'formCancel()', ngClick: 'formCancel()',
ngShow: 'inventory_script_obj.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!inventory_script_obj.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: 'custom_inventory_form.$pristine || custom_inventory_form.$invalid || !canEdit' //Disable when $pristine or $invalid, optional ngDisabled: 'custom_inventory_form.$pristine || custom_inventory_form.$invalid || !canEdit', //Disable when $pristine or $invalid, optional
ngShow: 'inventory_script_obj.summary_fields.user_capabilities.edit'
} }
} }
}; };

17
awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
View File

@@ -42,7 +42,8 @@ export default function(){
ngClick: 'addCustomInv()', ngClick: 'addCustomInv()',
awToolTip: 'Create a new custom inventory', awToolTip: 'Create a new custom inventory',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -56,7 +57,16 @@ export default function(){
label: 'Edit', label: 'Edit',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Edit inventory script', awToolTip: 'Edit inventory script',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'inventory_script.summary_fields.user_capabilities.edit'
},
view: {
ngClick: "editCustomInv(inventory_script.id)",
label: 'View',
"class": 'btn-sm',
awToolTip: 'View inventory script',
dataPlacement: 'top',
ngShow: '!inventory_script.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
ngClick: "deleteCustomInv(inventory_script.id, inventory_script.name)", ngClick: "deleteCustomInv(inventory_script.id, inventory_script.name)",
@@ -64,7 +74,8 @@ export default function(){
label: 'Delete', label: 'Delete',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Delete inventory script', awToolTip: 'Delete inventory script',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'inventory_script.summary_fields.user_capabilities.delete'
} }
} }
}; };

11
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@@ -7,17 +7,24 @@
export default export default
[ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject', [ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject',
'GetBasePath' , 'SearchInit' , 'PaginateInit', 'Rest' , 'ProcessErrors', 'GetBasePath' , 'SearchInit' , 'PaginateInit', 'Rest' , 'ProcessErrors',
'Prompt', '$state', '$filter', 'Prompt', '$state', '$filter', 'rbacUiControlService',
function( function(
$rootScope,Wait, GenerateList, inventoryScriptsListObject, $rootScope,Wait, GenerateList, inventoryScriptsListObject,
GetBasePath, SearchInit, PaginateInit, GetBasePath, SearchInit, PaginateInit,
Rest, ProcessErrors, Prompt, $state, $filter Rest, ProcessErrors, Prompt, $state, $filter, rbacUiControlService
) { ) {
var scope = $rootScope.$new(), var scope = $rootScope.$new(),
defaultUrl = GetBasePath('inventory_scripts'), defaultUrl = GetBasePath('inventory_scripts'),
list = inventoryScriptsListObject, list = inventoryScriptsListObject,
view = GenerateList; view = GenerateList;
scope.canAdd = false;
rbacUiControlService.canAdd("inventory_scripts")
.then(function(canAdd) {
scope.canAdd = canAdd;
});
view.inject( list, { view.inject( list, {
mode: 'edit', mode: 'edit',
scope: scope scope: scope

9
awx/ui/client/src/job-templates/add/job-templates-add.controller.js
View File

@@ -21,6 +21,15 @@
$state, CreateSelect2, $q $state, CreateSelect2, $q
) { ) {
Rest.setUrl(GetBasePath('job_templates'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a job template.', 'alert-info');
}
});
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view
var defaultUrl = GetBasePath('job_templates'), var defaultUrl = GetBasePath('job_templates'),

12
awx/ui/client/src/job-templates/list/job-templates-list.controller.js
View File

@@ -10,18 +10,24 @@ export default
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList', 'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList',
'LookUpInit', 'InitiatePlaybookRun', 'Wait', '$compile', 'LookUpInit', 'InitiatePlaybookRun', 'Wait', '$compile',
'$state', '$filter', '$state', '$filter', 'rbacUiControlService',
function( function(
$scope, $rootScope, $location, $log, $scope, $rootScope, $location, $log,
$stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt, $stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt,
SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors,
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, InitiatePlaybookRun, GetBasePath, JobTemplateForm, CredentialList, LookUpInit, InitiatePlaybookRun,
Wait, $compile, $state, $filter Wait, $compile, $state, $filter, rbacUiControlService
) { ) {
ClearScope(); ClearScope();
$scope.canAdd = false;
rbacUiControlService.canAdd("job_templates")
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
var list = JobTemplateList, var list = JobTemplateList,
defaultUrl = GetBasePath('job_templates'), defaultUrl = GetBasePath('job_templates'),
view = GenerateList, view = GenerateList,

6
awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
View File

@@ -70,6 +70,12 @@
flex: 0 0 637px; flex: 0 0 637px;
max-width: 637px; max-width: 637px;
} }
.SurveyMaker-previewPanel--viewOnly {
flex: 0 0 1155px;
max-width: 1155px;
}
.SurveyMaker-separatorPanel { .SurveyMaker-separatorPanel {
display: flex; display: flex;
flex: 0 0 51px; flex: 0 0 51px;

13
awx/ui/client/src/lists/AllJobs.js
View File

@@ -94,28 +94,33 @@ export default
fieldActions: { fieldActions: {
columnClass: 'col-lg-2 col-md-2 col-sm-3 col-xs-4', columnClass: 'col-lg-2 col-md-2 col-sm-3 col-xs-4',
"view": {
mode: "all",
ngClick: "viewJob(all_job.id)",
awToolTip: "View the job",
dataPlacement: "top"
},
submit: { submit: {
icon: 'icon-rocket', icon: 'icon-rocket',
mode: 'all', mode: 'all',
ngClick: 'relaunchJob($event, all_job.id)', ngClick: 'relaunchJob($event, all_job.id)',
awToolTip: 'Relaunch using the same parameters', awToolTip: 'Relaunch using the same parameters',
dataPlacement: 'top', dataPlacement: 'top',
ngHide: "all_job.type == 'system_job' " ngShow: "!(all_job.type == 'system_job') && all_job.summary_fields.user_capabilities.start"
}, },
cancel: { cancel: {
mode: 'all', mode: 'all',
ngClick: 'deleteJob(all_job.id)', ngClick: 'deleteJob(all_job.id)',
awToolTip: 'Cancel the job', awToolTip: 'Cancel the job',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: "all_job.status === 'running'|| all_job.status === 'waiting' || all_job.status === 'pending'" ngShow: "(all_job.status === 'running'|| all_job.status === 'waiting' || all_job.status === 'pending') && all_job.summary_fields.user_capabilities.start"
}, },
"delete": { "delete": {
mode: 'all', mode: 'all',
ngClick: 'deleteJob(all_job.id)', ngClick: 'deleteJob(all_job.id)',
awToolTip: 'Delete the job', awToolTip: 'Delete the job',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: "all_job.status !== 'running' && all_job.status !== 'waiting' && all_job.status !== 'pending'" ngShow: "(all_job.status !== 'running' && all_job.status !== 'waiting' && all_job.status !== 'pending') && all_job.summary_fields.user_capabilities.delete"
} }
} }
}); });

5
awx/ui/client/src/lists/CompletedJobs.js
View File

@@ -100,13 +100,14 @@ export default
ngClick: 'relaunchJob($event, completed_job.id)', ngClick: 'relaunchJob($event, completed_job.id)',
awToolTip: 'Relaunch using the same parameters', awToolTip: 'Relaunch using the same parameters',
dataPlacement: 'top', dataPlacement: 'top',
ngHide: "completed_job.type == 'system_job' " ngShow: "!completed_job.type == 'system_job' || completed_job.summary_fields.user_capabilities.start"
}, },
"delete": { "delete": {
mode: 'all', mode: 'all',
ngClick: 'deleteJob(completed_job.id)', ngClick: 'deleteJob(completed_job.id)',
awToolTip: 'Delete the job', awToolTip: 'Delete the job',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'completed_job.summary_fields.user_capabilities.delete'
} }
} }
}); });

15
awx/ui/client/src/lists/Credentials.js
View File

@@ -72,7 +72,17 @@ export default
label: 'Edit', label: 'Edit',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Edit credential', awToolTip: 'Edit credential',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'credential.summary_fields.user_capabilities.edit'
},
view: {
ngClick: "editCredential(credential.id)",
label: 'View',
"class": 'btn-sm',
awToolTip: 'View credential',
dataPlacement: 'top',
ngShow: '!credential.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
@@ -81,7 +91,8 @@ export default
label: 'Delete', label: 'Delete',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Delete credential', awToolTip: 'Delete credential',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'credential.summary_fields.user_capabilities.delete'
} }
} }
}); });

16
awx/ui/client/src/lists/Inventories.js
View File

@@ -91,7 +91,8 @@ export default
ngClick: 'addInventory()', ngClick: 'addInventory()',
awToolTip: 'Create a new inventory', awToolTip: 'Create a new inventory',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -103,13 +104,22 @@ export default
label: 'Edit', label: 'Edit',
ngClick: 'editInventory(inventory.id)', ngClick: 'editInventory(inventory.id)',
awToolTip: 'Edit inventory', awToolTip: 'Edit inventory',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'inventory.summary_fields.user_capabilities.edit'
},
view: {
label: 'View',
ngClick: 'editInventory(inventory.id)',
awToolTip: 'View inventory',
dataPlacement: 'top',
ngShow: '!inventory.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteInventory(inventory.id, inventory.name)", ngClick: "deleteInventory(inventory.id, inventory.name)",
awToolTip: 'Delete inventory', awToolTip: 'Delete inventory',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'inventory.summary_fields.user_capabilities.delete'
} }
} }
}); });

32
awx/ui/client/src/lists/InventoryGroups.js
View File

@@ -143,7 +143,8 @@ export default
actionClass: 'btn List-buttonDefault', actionClass: 'btn List-buttonDefault',
buttonContent: 'RUN COMMANDS', buttonContent: 'RUN COMMANDS',
showTipWhenDisabled: true, showTipWhenDisabled: true,
tooltipInnerClass: "Tooltip-wide" tooltipInnerClass: "Tooltip-wide",
ngShow: 'canAdhoc'
// TODO: set up a tip watcher and change text based on when // TODO: set up a tip watcher and change text based on when
// things are selected/not selected. This is started and // things are selected/not selected. This is started and
// commented out in the inventory controller within the watchers. // commented out in the inventory controller within the watchers.
@@ -155,7 +156,8 @@ export default
ngClick: "createGroup()", ngClick: "createGroup()",
awToolTip: "Create a new group", awToolTip: "Create a new group",
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD GROUP' buttonContent: '&#43; ADD GROUP',
ngShow: 'canAdd'
} }
}, },
@@ -169,8 +171,8 @@ export default
ngClick: 'updateGroup(group)', ngClick: 'updateGroup(group)',
awToolTip: "{{ group.launch_tooltip }}", awToolTip: "{{ group.launch_tooltip }}",
dataTipWatch: "group.launch_tooltip", dataTipWatch: "group.launch_tooltip",
ngShow: "group.status !== 'running' && group.status " + ngShow: "(group.status !== 'running' && group.status " +
"!== 'pending' && group.status !== 'updating'", "!== 'pending' && group.status !== 'updating') && group.summary_fields.user_capabilities.start",
ngClass: "group.launch_class", ngClass: "group.launch_class",
dataPlacement: "top", dataPlacement: "top",
}, },
@@ -180,8 +182,8 @@ export default
ngClick: "cancelUpdate(group.id)", ngClick: "cancelUpdate(group.id)",
awToolTip: "Cancel sync process", awToolTip: "Cancel sync process",
'class': 'red-txt', 'class': 'red-txt',
ngShow: "group.status == 'running' || group.status == 'pending' " + ngShow: "(group.status == 'running' || group.status == 'pending' " +
"|| group.status == 'updating'", "|| group.status == 'updating') && group.summary_fields.user_capabilities.start",
dataPlacement: "top", dataPlacement: "top",
iconClass: "fa fa-minus-circle" iconClass: "fa fa-minus-circle"
}, },
@@ -189,7 +191,7 @@ export default
mode: 'all', mode: 'all',
ngClick: "copyMoveGroup(group.id)", ngClick: "copyMoveGroup(group.id)",
awToolTip: 'Copy or move group', awToolTip: 'Copy or move group',
ngShow: "group.id > 0", ngShow: "group.id > 0 && group.summary_fields.user_capabilities.copy",
dataPlacement: "top" dataPlacement: "top"
}, },
schedule: { schedule: {
@@ -198,21 +200,31 @@ export default
awToolTip: "{{ group.group_schedule_tooltip }}", awToolTip: "{{ group.group_schedule_tooltip }}",
ngClass: "group.scm_type_class", ngClass: "group.scm_type_class",
dataPlacement: 'top', dataPlacement: 'top',
ngHide: "group.summary_fields.inventory_source.source === ''" ngShow: "!(group.summary_fields.inventory_source.source === '') && group.summary_fields.user_capabilities.schedule"
}, },
edit: { edit: {
//label: 'Edit', //label: 'Edit',
mode: 'all', mode: 'all',
ngClick: "editGroup(group.id)", ngClick: "editGroup(group.id)",
awToolTip: 'Edit group', awToolTip: 'Edit group',
dataPlacement: "top" dataPlacement: "top",
ngShow: "group.summary_fields.user_capabilities.edit"
},
view: {
//label: 'Edit',
mode: 'all',
ngClick: "editGroup(group.id)",
awToolTip: 'View group',
dataPlacement: "top",
ngShow: "!group.summary_fields.user_capabilities.edit"
}, },
"delete": { "delete": {
//label: 'Delete', //label: 'Delete',
mode: 'all', mode: 'all',
ngClick: "deleteGroup(group)", ngClick: "deleteGroup(group)",
awToolTip: 'Delete group', awToolTip: 'Delete group',
dataPlacement: "top" dataPlacement: "top",
ngShow: "group.summary_fields.user_capabilities.delete"
} }
} }
}); });

19
awx/ui/client/src/lists/InventoryHosts.js
View File

@@ -78,21 +78,31 @@ export default
mode: 'all', mode: 'all',
ngClick: "copyMoveHost(host.id)", ngClick: "copyMoveHost(host.id)",
awToolTip: 'Copy or move host to another group', awToolTip: 'Copy or move host to another group',
dataPlacement: "top" dataPlacement: "top",
ngShow: 'host.summary_fields.user_capabilities.edit'
}, },
edit: { edit: {
//label: 'Edit', //label: 'Edit',
ngClick: "editHost(host.id)", ngClick: "editHost(host.id)",
icon: 'icon-edit', icon: 'icon-edit',
awToolTip: 'Edit host', awToolTip: 'Edit host',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'host.summary_fields.user_capabilities.edit'
},
view: {
//label: 'Edit',
ngClick: "editHost(host.id)",
awToolTip: 'View host',
dataPlacement: 'top',
ngShow: '!host.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
//label: 'Delete', //label: 'Delete',
ngClick: "deleteHost(host.id, host.name)", ngClick: "deleteHost(host.id, host.name)",
icon: 'icon-trash', icon: 'icon-trash',
awToolTip: 'Delete host', awToolTip: 'Delete host',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'host.summary_fields.user_capabilities.delete'
} }
}, },
@@ -122,7 +132,8 @@ export default
ngClick: "createHost()", ngClick: "createHost()",
awToolTip: "Create a new host", awToolTip: "Create a new host",
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD HOST' buttonContent: '&#43; ADD HOST',
ngShow: 'canAdd'
} }
} }

19
awx/ui/client/src/lists/JobTemplates.js
View File

@@ -55,7 +55,8 @@ export default
basePaths: ['job_templates'], basePaths: ['job_templates'],
awToolTip: 'Create a new template', awToolTip: 'Create a new template',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -68,7 +69,8 @@ export default
mode: 'all', mode: 'all',
ngClick: 'submitJob(job_template.id)', ngClick: 'submitJob(job_template.id)',
awToolTip: 'Start a job using this template', awToolTip: 'Start a job using this template',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'job_template.summary_fields.user_capabilities.start'
}, },
schedule: { schedule: {
label: 'Schedule', label: 'Schedule',
@@ -76,6 +78,7 @@ export default
ngClick: 'scheduleJob(job_template.id)', ngClick: 'scheduleJob(job_template.id)',
awToolTip: 'Schedule future job template runs', awToolTip: 'Schedule future job template runs',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'job_template.summary_fields.user_capabilities.schedule'
}, },
copy: { copy: {
label: 'Copy', label: 'Copy',
@@ -83,7 +86,7 @@ export default
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: 'Copy template', awToolTip: 'Copy template',
dataPlacement: 'top', dataPlacement: 'top',
ngHide: 'job_template.summary_fields.can_copy===false' ngShow: 'job_template.summary_fields.user_capabilities.copy'
}, },
edit: { edit: {
label: 'Edit', label: 'Edit',
@@ -91,6 +94,15 @@ export default
awToolTip: 'Edit template', awToolTip: 'Edit template',
"class": 'btn-default btn-xs', "class": 'btn-default btn-xs',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'job_template.summary_fields.user_capabilities.edit'
},
view: {
label: 'View',
ngClick: "editJobTemplate(job_template.id)",
awToolTip: 'View template',
"class": 'btn-default btn-xs',
dataPlacement: 'top',
ngShow: '!job_template.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
label: 'Delete', label: 'Delete',
@@ -98,6 +110,7 @@ export default
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: 'Delete template', awToolTip: 'Delete template',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'job_template.summary_fields.user_capabilities.delete'
} }
} }
}); });

23
awx/ui/client/src/lists/Projects.js
View File

@@ -65,7 +65,8 @@ export default
ngClick: 'addProject()', ngClick: 'addProject()',
awToolTip: 'Create a new project', awToolTip: 'Create a new project',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: "canAdd"
}, },
refresh: { refresh: {
mode: 'all', mode: 'all',
@@ -86,30 +87,40 @@ export default
awToolTip: "{{ project.scm_update_tooltip }}", awToolTip: "{{ project.scm_update_tooltip }}",
dataTipWatch: "project.scm_update_tooltip", dataTipWatch: "project.scm_update_tooltip",
ngClass: "project.scm_type_class", ngClass: "project.scm_type_class",
dataPlacement: 'top' dataPlacement: 'top',
ngShow: "project.summary_fields.user_capabilities.start"
}, },
schedule: { schedule: {
mode: 'all', mode: 'all',
ngClick: "editSchedules(project.id)", ngClick: "editSchedules(project.id)",
awToolTip: "{{ project.scm_schedule_tooltip }}", awToolTip: "{{ project.scm_schedule_tooltip }}",
ngClass: "project.scm_type_class", ngClass: "project.scm_type_class",
dataPlacement: 'top' dataPlacement: 'top',
ngShow: "project.summary_fields.user_capabilities.schedule"
}, },
edit: { edit: {
ngClick: "editProject(project.id)", ngClick: "editProject(project.id)",
awToolTip: 'Edit the project', awToolTip: 'Edit the project',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: "project.summary_fields.user_capabilities.edit"
},
view: {
ngClick: "editProject(project.id)",
awToolTip: 'View the project',
dataPlacement: 'top',
ngShow: "!project.summary_fields.user_capabilities.edit",
icon: 'fa-eye',
}, },
"delete": { "delete": {
ngClick: "deleteProject(project.id, project.name)", ngClick: "deleteProject(project.id, project.name)",
awToolTip: 'Delete the project', awToolTip: 'Delete the project',
ngShow: "project.status !== 'updating' && project.status !== 'running' && project.status !== 'pending'", ngShow: "(project.status !== 'updating' && project.status !== 'running' && project.status !== 'pending') && project.summary_fields.user_capabilities.delete",
dataPlacement: 'top' dataPlacement: 'top'
}, },
cancel: { cancel: {
ngClick: "cancelUpdate(project.id, project.name)", ngClick: "cancelUpdate(project.id, project.name)",
awToolTip: 'Cancel the SCM update', awToolTip: 'Cancel the SCM update',
ngShow: "project.status == 'updating' || project.status == 'running' || project.status == 'pending'", ngShow: "(project.status == 'updating' || project.status == 'running' || project.status == 'pending') && project.summary_fields.user_capabilities.start",
dataPlacement: 'top' dataPlacement: 'top'
} }
} }

13
awx/ui/client/src/lists/ScheduledJobs.js
View File

@@ -78,13 +78,22 @@ export default
mode: "all", mode: "all",
ngClick: "editSchedule(schedule)", ngClick: "editSchedule(schedule)",
awToolTip: "Edit the schedule", awToolTip: "Edit the schedule",
dataPlacement: "top" dataPlacement: "top",
ngShow: 'schedule.summary_fields.user_capabilities.edit'
},
"view": {
mode: "all",
ngClick: "editSchedule(schedule)",
awToolTip: "View the schedule",
dataPlacement: "top",
ngShow: '!schedule.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
mode: 'all', mode: 'all',
ngClick: 'deleteSchedule(schedule.id)', ngClick: 'deleteSchedule(schedule.id)',
awToolTip: 'Delete the schedule', awToolTip: 'Delete the schedule',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'schedule.summary_fields.user_capabilities.delete'
} }
} }
}); });

16
awx/ui/client/src/lists/Schedules.js
View File

@@ -69,7 +69,8 @@ export default
ngClick: 'addSchedule()', ngClick: 'addSchedule()',
awToolTip: 'Add a new schedule', awToolTip: 'Add a new schedule',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -79,14 +80,23 @@ export default
ngClick: "editSchedule(schedule.id)", ngClick: "editSchedule(schedule.id)",
icon: 'icon-edit', icon: 'icon-edit',
awToolTip: 'Edit schedule', awToolTip: 'Edit schedule',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'schedule.summary_fields.user_capabilities.edit'
},
view: {
label: 'View',
ngClick: "editSchedule(schedule.id)",
awToolTip: 'View schedule',
dataPlacement: 'top',
ngShow: '!schedule.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteSchedule(schedule.id)", ngClick: "deleteSchedule(schedule.id)",
icon: 'icon-trash', icon: 'icon-trash',
awToolTip: 'Delete schedule', awToolTip: 'Delete schedule',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'schedule.summary_fields.user_capabilities.delete'
} }
} }
}); });

18
awx/ui/client/src/lists/Teams.js
View File

@@ -47,7 +47,8 @@ export default
ngClick: 'addTeam()', ngClick: 'addTeam()',
awToolTip: 'Create a new team', awToolTip: 'Create a new team',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -61,16 +62,25 @@ export default
icon: 'icon-edit', icon: 'icon-edit',
"class": 'btn-xs btn-default', "class": 'btn-xs btn-default',
awToolTip: 'Edit team', awToolTip: 'Edit team',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'team.summary_fields.user_capabilities.edit'
},
view: {
label: 'View',
ngClick: "editTeam(team.id)",
"class": 'btn-xs btn-default',
awToolTip: 'View team',
dataPlacement: 'top',
ngShow: '!team.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteTeam(team.id, team.name)", ngClick: "deleteTeam(team.id, team.name)",
icon: 'icon-trash', icon: 'icon-trash',
"class": 'btn-xs btn-danger', "class": 'btn-xs btn-danger',
awToolTip: 'Delete team', awToolTip: 'Delete team',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'team.summary_fields.user_capabilities.delete'
} }
} }
}); });

18
awx/ui/client/src/lists/Users.js
View File

@@ -44,7 +44,8 @@ export default
basePaths: ['organizations', 'users'], // base path must be in list, or action not available basePaths: ['organizations', 'users'], // base path must be in list, or action not available
awToolTip: 'Create a new user', awToolTip: 'Create a new user',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -58,7 +59,17 @@ export default
icon: 'icon-edit', icon: 'icon-edit',
"class": 'btn-xs btn-default', "class": 'btn-xs btn-default',
awToolTip: 'Edit user', awToolTip: 'Edit user',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'user.summary_fields.user_capabilities.edit'
},
view: {
label: 'View',
ngClick: "editUser(user.id)",
"class": 'btn-xs btn-default',
awToolTip: 'View user',
dataPlacement: 'top',
ngShow: '!user.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
@@ -67,7 +78,8 @@ export default
icon: 'icon-trash', icon: 'icon-trash',
"class": 'btn-xs btn-danger', "class": 'btn-xs btn-danger',
awToolTip: 'Delete user', awToolTip: 'Delete user',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'user.summary_fields.user_capabilities.delete'
} }
} }
}); });

2
awx/ui/client/src/management-jobs/card/card.partial.html
View File

@@ -17,6 +17,7 @@
<div class="MgmtCards-actionItems"> <div class="MgmtCards-actionItems">
<button class="MgmtCards-actionItem List-actionButton" <button class="MgmtCards-actionItem List-actionButton"
ng-click='chooseRunJob(card.id, card.name)' ng-click='chooseRunJob(card.id, card.name)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="Launch Management Job" data-original-title="" title=""> data-placement="top" aw-tool-tip="Launch Management Job" data-original-title="" title="">
<i class="MgmtCards-actionItemIcon icon-launch"></i> <i class="MgmtCards-actionItemIcon icon-launch"></i>
</button> </button>
@@ -27,6 +28,7 @@
</button> </button>
<button class="MgmtCards-actionItem List-actionButton" <button class="MgmtCards-actionItem List-actionButton"
ng-click='goToNotifications(card, card.id)' ng-click='goToNotifications(card, card.id)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="Configure Notifications" data-original-title="" title="" ng-class="{'List-editButton--selected': activeCard === card.id && cardAction === 'notifications'}"> data-placement="top" aw-tool-tip="Configure Notifications" data-original-title="" title="" ng-class="{'List-editButton--selected': activeCard === card.id && cardAction === 'notifications'}">
<i class="MgmtCards-actionItemIcon fa fa-bell-o"></i> <i class="MgmtCards-actionItemIcon fa fa-bell-o"></i>
</button> </button>

13
awx/ui/client/src/notifications/add/add.controller.js
View File

@@ -9,14 +9,23 @@ export default
'NotificationsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty', 'NotificationsFormObject', 'ProcessErrors', 'GetBasePath', 'Empty',
'GenerateForm', 'SearchInit' , 'PaginateInit', 'LookUpInit', 'GenerateForm', 'SearchInit' , 'PaginateInit', 'LookUpInit',
'OrganizationList', '$scope', '$state', 'CreateSelect2', 'GetChoices', 'OrganizationList', '$scope', '$state', 'CreateSelect2', 'GetChoices',
'NotificationsTypeChange', 'ParseTypeChange', 'NotificationsTypeChange', 'ParseTypeChange', 'Alert',
function( function(
$rootScope, pagination, $compile, SchedulerInit, Rest, Wait, $rootScope, pagination, $compile, SchedulerInit, Rest, Wait,
NotificationsFormObject, ProcessErrors, GetBasePath, Empty, NotificationsFormObject, ProcessErrors, GetBasePath, Empty,
GenerateForm, SearchInit, PaginateInit, LookUpInit, GenerateForm, SearchInit, PaginateInit, LookUpInit,
OrganizationList, $scope, $state, CreateSelect2, GetChoices, OrganizationList, $scope, $state, CreateSelect2, GetChoices,
NotificationsTypeChange, ParseTypeChange NotificationsTypeChange, ParseTypeChange, Alert
) { ) {
Rest.setUrl(GetBasePath('projects'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info');
}
});
var generator = GenerateForm, var generator = GenerateForm,
form = NotificationsFormObject, form = NotificationsFormObject,
url = GetBasePath('notification_templates'); url = GetBasePath('notification_templates');

11
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@@ -8,12 +8,12 @@ export default
[ '$rootScope','Wait', 'generateList', 'NotificationTemplatesList', [ '$rootScope','Wait', 'generateList', 'NotificationTemplatesList',
'GetBasePath' , 'SearchInit' , 'PaginateInit', 'Rest' , 'GetBasePath' , 'SearchInit' , 'PaginateInit', 'Rest' ,
'ProcessErrors', 'Prompt', '$state', 'GetChoices', 'Empty', 'Find', 'ProcessErrors', 'Prompt', '$state', 'GetChoices', 'Empty', 'Find',
'ngToast', '$compile', '$filter', 'ngToast', '$compile', '$filter', 'rbacUiControlService',
function( function(
$rootScope,Wait, GenerateList, NotificationTemplatesList, $rootScope,Wait, GenerateList, NotificationTemplatesList,
GetBasePath, SearchInit, PaginateInit, Rest, GetBasePath, SearchInit, PaginateInit, Rest,
ProcessErrors, Prompt, $state, GetChoices, Empty, Find, ngToast, ProcessErrors, Prompt, $state, GetChoices, Empty, Find, ngToast,
$compile, $filter) { $compile, $filter, rbacUiControlService) {
var scope = $rootScope.$new(), var scope = $rootScope.$new(),
defaultUrl = GetBasePath('notification_templates'), defaultUrl = GetBasePath('notification_templates'),
list = NotificationTemplatesList, list = NotificationTemplatesList,
@@ -24,6 +24,13 @@ export default
scope: scope scope: scope
}); });
scope.canAdd = false;
rbacUiControlService.canAdd("notification_templates")
.then(function(canAdd) {
scope.canAdd = canAdd;
});
scope.removePostRefresh = scope.$on('PostRefresh', function () { scope.removePostRefresh = scope.$on('PostRefresh', function () {
Wait('stop'); Wait('stop');
if (scope.notification_templates) { if (scope.notification_templates) {

104
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@@ -27,13 +27,15 @@ export default function() {
type: 'text', type: 'text',
addRequired: true, addRequired: true,
editRequired: true, editRequired: true,
capitalize: false capitalize: false,
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
description: { description: {
label: 'Description', label: 'Description',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false editRequired: false,
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
@@ -44,7 +46,8 @@ export default function() {
awRequiredWhen: { awRequiredWhen: {
reqExpression: "organizationrequired", reqExpression: "organizationrequired",
init: "true" init: "true"
} },
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
notification_type: { notification_type: {
label: 'Type', label: 'Type',
@@ -54,13 +57,15 @@ export default function() {
class: 'NotificationsForm-typeSelect', class: 'NotificationsForm-typeSelect',
ngOptions: 'type.label for type in notification_type_options track by type.value', ngOptions: 'type.label for type in notification_type_options track by type.value',
ngChange: 'typeChange()', ngChange: 'typeChange()',
hasSubForm: true hasSubForm: true,
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
username: { username: {
label: 'Username', label: 'Username',
type: 'text', type: 'text',
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
host: { host: {
@@ -71,7 +76,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
sender: { sender: {
label: 'Sender Email', label: 'Sender Email',
@@ -81,7 +87,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
recipients: { recipients: {
label: 'Recipient List', label: 'Recipient List',
@@ -97,7 +104,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
password: { password: {
labelBind: 'passwordLabel', labelBind: 'passwordLabel',
@@ -108,7 +116,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ", ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
port: { port: {
labelBind: 'portLabel', labelBind: 'portLabel',
@@ -122,7 +131,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'email' || notification_type.value == 'irc'", ngShow: "notification_type.value == 'email' || notification_type.value == 'irc'",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
channels: { channels: {
label: 'Destination Channels', label: 'Destination Channels',
@@ -138,7 +148,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'slack'", ngShow: "notification_type.value == 'slack'",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
rooms: { rooms: {
label: 'Destination Channels', label: 'Destination Channels',
@@ -154,7 +165,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'hipchat'", ngShow: "notification_type.value == 'hipchat'",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
token: { token: {
labelBind: 'tokenLabel', labelBind: 'tokenLabel',
@@ -165,7 +177,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'slack' || notification_type.value == 'pagerduty' || notification_type.value == 'hipchat'", ngShow: "notification_type.value == 'slack' || notification_type.value == 'pagerduty' || notification_type.value == 'hipchat'",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
account_token: { account_token: {
label: 'Account Token', label: 'Account Token',
@@ -176,7 +189,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'twilio' ", ngShow: "notification_type.value == 'twilio' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
from_number: { from_number: {
label: 'Source Phone Number', label: 'Source Phone Number',
@@ -188,7 +202,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'twilio' ", ngShow: "notification_type.value == 'twilio' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
to_numbers: { to_numbers: {
label: 'Destination SMS Number', label: 'Destination SMS Number',
@@ -204,7 +219,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'twilio' ", ngShow: "notification_type.value == 'twilio' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
account_sid: { account_sid: {
label: 'Account SID', label: 'Account SID',
@@ -214,7 +230,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'twilio' ", ngShow: "notification_type.value == 'twilio' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
subdomain: { subdomain: {
label: 'Pagerduty subdomain', label: 'Pagerduty subdomain',
@@ -224,7 +241,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'pagerduty' ", ngShow: "notification_type.value == 'pagerduty' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
service_key: { service_key: {
label: 'API Service/Integration Key', label: 'API Service/Integration Key',
@@ -234,7 +252,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'pagerduty' ", ngShow: "notification_type.value == 'pagerduty' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
client_name: { client_name: {
label: 'Client Identifier', label: 'Client Identifier',
@@ -244,7 +263,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'pagerduty' ", ngShow: "notification_type.value == 'pagerduty' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
message_from: { message_from: {
label: 'Label to be shown with notification', label: 'Label to be shown with notification',
@@ -254,7 +274,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'hipchat' ", ngShow: "notification_type.value == 'hipchat' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
api_url: { api_url: {
label: 'API URL', label: 'API URL',
@@ -265,7 +286,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'hipchat' ", ngShow: "notification_type.value == 'hipchat' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
color: { color: {
label: 'Notification Color', label: 'Notification Color',
@@ -277,13 +299,15 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'hipchat' ", ngShow: "notification_type.value == 'hipchat' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
notify: { notify: {
label: 'Notify Channel', label: 'Notify Channel',
type: 'checkbox', type: 'checkbox',
ngShow: "notification_type.value == 'hipchat' ", ngShow: "notification_type.value == 'hipchat' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
url: { url: {
label: 'Target URL', label: 'Target URL',
@@ -293,7 +317,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'webhook' ", ngShow: "notification_type.value == 'webhook' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
headers: { headers: {
label: 'HTTP Headers', label: 'HTTP Headers',
@@ -313,7 +338,8 @@ export default function() {
'</pre></p>', '</pre></p>',
dataPlacement: 'right', dataPlacement: 'right',
ngShow: "notification_type.value == 'webhook' ", ngShow: "notification_type.value == 'webhook' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
server: { server: {
label: 'IRC Server Address', label: 'IRC Server Address',
@@ -323,7 +349,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'irc' ", ngShow: "notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
nickname: { nickname: {
label: 'IRC Nick', label: 'IRC Nick',
@@ -333,7 +360,8 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'irc' ", ngShow: "notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
targets: { targets: {
label: 'Destination Channels or Users', label: 'Destination Channels or Users',
@@ -349,13 +377,15 @@ export default function() {
init: "false" init: "false"
}, },
ngShow: "notification_type.value == 'irc' ", ngShow: "notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
use_ssl: { use_ssl: {
label: 'SSL Connection', label: 'SSL Connection',
type: 'checkbox', type: 'checkbox',
ngShow: "notification_type.value == 'irc'", ngShow: "notification_type.value == 'irc'",
subForm: 'typeSubForm' subForm: 'typeSubForm',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, },
checkbox_group: { checkbox_group: {
label: 'Options', label: 'Options',
@@ -367,13 +397,15 @@ export default function() {
label: 'Use TLS', label: 'Use TLS',
type: 'checkbox', type: 'checkbox',
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
labelClass: 'checkbox-options stack-inline' labelClass: 'checkbox-options stack-inline',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}, { }, {
name: 'use_ssl', name: 'use_ssl',
label: 'Use SSL', label: 'Use SSL',
type: 'checkbox', type: 'checkbox',
ngShow: "notification_type.value == 'email'", ngShow: "notification_type.value == 'email'",
labelClass: 'checkbox-options stack-inline' labelClass: 'checkbox-options stack-inline',
ngDisabled: '!notification_template.summary_fields.user_capabilities.edit'
}] }]
} }
}, },
@@ -381,9 +413,15 @@ export default function() {
buttons: { //for now always generates <button> tags buttons: { //for now always generates <button> tags
cancel: { cancel: {
ngClick: 'formCancel()', ngClick: 'formCancel()',
ngShow: 'notification_template.summary_fields.user_capabilities.edit'
},
close: {
ngClick: 'formCancel()',
ngShow: '!notification_template.summary_fields.user_capabilities.edit'
}, },
save: { save: {
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()',
ngShow: 'notification_template.summary_fields.user_capabilities.edit', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
} }
} }

20
awx/ui/client/src/notifications/notificationTemplates.list.js
View File

@@ -49,7 +49,8 @@ export default function(){
ngClick: 'addNotification()', ngClick: 'addNotification()',
awToolTip: 'Create a new custom inventory', awToolTip: 'Create a new custom inventory',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD' buttonContent: '&#43; ADD',
ngShow: 'canAdd'
} }
}, },
@@ -62,7 +63,8 @@ export default function(){
label: 'Edit', label: 'Edit',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Test notification', awToolTip: 'Test notification',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'notification_template.summary_fields.user_capabilities.edit'
}, },
edit: { edit: {
ngClick: "editNotification(notification_template.id)", ngClick: "editNotification(notification_template.id)",
@@ -70,7 +72,16 @@ export default function(){
label: 'Edit', label: 'Edit',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Edit notification', awToolTip: 'Edit notification',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'notification_template.summary_fields.user_capabilities.edit'
},
view: {
ngClick: "editNotification(notification_template.id)",
label: 'View',
"class": 'btn-sm',
awToolTip: 'View notification',
dataPlacement: 'top',
ngShow: '!notification_template.summary_fields.user_capabilities.edit'
}, },
"delete": { "delete": {
ngClick: "deleteNotification(notification_template.id, notification_template.name)", ngClick: "deleteNotification(notification_template.id, notification_template.name)",
@@ -78,7 +89,8 @@ export default function(){
label: 'Delete', label: 'Delete',
"class": 'btn-sm', "class": 'btn-sm',
awToolTip: 'Delete notification', awToolTip: 'Delete notification',
dataPlacement: 'top' dataPlacement: 'top',
ngShow: 'notification_template.summary_fields.user_capabilities.delete'
} }
} }
}; };

3
awx/ui/client/src/notifications/notifications.list.js
View File

@@ -65,7 +65,8 @@ export default function(){
ngClick: 'addNotificationTemplate()', ngClick: 'addNotificationTemplate()',
awToolTip: 'Create a new notification template', awToolTip: 'Create a new notification template',
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD NOTIFICATION TEMPLATE' buttonContent: '&#43; ADD NOTIFICATION TEMPLATE',
ngShow: 'current_user.is_superuser || (current_user_admin_orgs && current_user_admin_orgs.length > 0)'
} }
} }

12
awx/ui/client/src/notifications/shared/notification-list-init.factory.js
View File

@@ -15,13 +15,21 @@
*/ */
export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices', export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
'$state', '$state', '$rootScope',
function(Wait, GetBasePath, ProcessErrors, Rest, GetChoices, $state) { function(Wait, GetBasePath, ProcessErrors, Rest, GetChoices, $state, $rootScope) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
url = params.url, url = params.url,
id = params.id; id = params.id;
scope.current_user_admin_orgs = [];
Rest.setUrl($rootScope.current_user.related.admin_of_organizations);
Rest.get()
.success(function(data) {
scope.current_user_admin_orgs = data.results.map(i => i.name);
});
scope.addNotificationTemplate = function(){ scope.addNotificationTemplate = function(){
$state.go('notifications.add'); $state.go('notifications.add');
}; };

9
awx/ui/client/src/organizations/add/organizations-add.controller.js
View File

@@ -12,6 +12,15 @@ export default ['$scope', '$rootScope', '$compile', '$location',
$stateParams, OrganizationForm, GenerateForm, Rest, Alert, ProcessErrors, $stateParams, OrganizationForm, GenerateForm, Rest, Alert, ProcessErrors,
ClearScope, GetBasePath, ReturnToCaller, Wait, $state) { ClearScope, GetBasePath, ReturnToCaller, Wait, $state) {
Rest.setUrl(GetBasePath('organizations'));
Rest.options()
.success(function(data) {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add an organization.', 'alert-info');
}
});
ClearScope(); ClearScope();
// Inject dynamic view // Inject dynamic view

12
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@@ -8,15 +8,22 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
'$log', '$compile', 'Rest', 'PaginateInit', '$log', '$compile', 'Rest', 'PaginateInit',
'SearchInit', 'OrganizationList', 'Alert', 'Prompt', 'ClearScope', 'SearchInit', 'OrganizationList', 'Alert', 'Prompt', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'Wait', 'ProcessErrors', 'GetBasePath', 'Wait',
'$state', 'generateList', 'Refresh', '$filter', '$state', 'generateList', 'Refresh', '$filter', 'rbacUiControlService',
function($stateParams, $scope, $rootScope, $location, function($stateParams, $scope, $rootScope, $location,
$log, $compile, Rest, PaginateInit, $log, $compile, Rest, PaginateInit,
SearchInit, OrganizationList, Alert, Prompt, ClearScope, SearchInit, OrganizationList, Alert, Prompt, ClearScope,
ProcessErrors, GetBasePath, Wait, ProcessErrors, GetBasePath, Wait,
$state, generateList, Refresh, $filter) { $state, generateList, Refresh, $filter, rbacUiControlService) {
ClearScope(); ClearScope();
$scope.canAdd = false;
rbacUiControlService.canAdd("organizations")
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
var defaultUrl = GetBasePath('organizations'), var defaultUrl = GetBasePath('organizations'),
list = OrganizationList, list = OrganizationList,
pageSize = 24, pageSize = 24,
@@ -25,6 +32,7 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
var parseCardData = function(cards) { var parseCardData = function(cards) {
return cards.map(function(card) { return cards.map(function(card) {
var val = {}, url = '/#/organizations/' + card.id + '/'; var val = {}, url = '/#/organizations/' + card.id + '/';
val.user_capabilities = card.summary_fields.user_capabilities;
val.name = card.name; val.name = card.name;
val.id = card.id; val.id = card.id;
val.description = card.description || undefined; val.description = card.description || undefined;

11
awx/ui/client/src/organizations/list/organizations-list.partial.html
View File

@@ -13,6 +13,7 @@
<div class="List-actions"> <div class="List-actions">
<button class="btn List-buttonSubmit" <button class="btn List-buttonSubmit"
aw-tool-tip="Create a new organization" aw-tool-tip="Create a new organization"
ng-show="canAdd"
ng-click="addOrganization()"> ng-click="addOrganization()">
+ ADD + ADD
</button> </button>
@@ -31,13 +32,23 @@
<div class="OrgCards-actionItems"> <div class="OrgCards-actionItems">
<button class="OrgCards-actionItem <button class="OrgCards-actionItem
List-actionButton" List-actionButton"
ng-show="card.user_capabilities.edit"
ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }" ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }"
ng-click="editOrganization(card.id)"> ng-click="editOrganization(card.id)">
<i class="OrgCards-actionItemIcon fa fa-pencil"> <i class="OrgCards-actionItemIcon fa fa-pencil">
</i> </i>
</button> </button>
<button class="OrgCards-actionItem
List-actionButton"
ng-show="!card.user_capabilities.edit"
ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }"
ng-click="editOrganization(card.id)">
<i class="OrgCards-actionItemIcon fa fa-search-plus">
</i>
</button>
<button class="OrgCards-actionItem List-actionButton <button class="OrgCards-actionItem List-actionButton
List-actionButton--delete" List-actionButton--delete"
ng-show="card.user_capabilities.delete"
ng-click="deleteOrganization(card.id, card.name)"> ng-click="deleteOrganization(card.id, card.name)">
<i class="OrgCards-actionItemIcon <i class="OrgCards-actionItemIcon
fa fa-trash-o"> fa fa-trash-o">

17
awx/ui/client/src/partials/survey-maker-modal.html
View File

@@ -32,13 +32,13 @@
</div> </div>
</div> </div>
<div class="SurveyMaker-content"> <div class="SurveyMaker-content">
<div class="SurveyMaker-questionPanel"> <div class="SurveyMaker-questionPanel" ng-show="job_template_obj.summary_fields.user_capabilities.edit">
<div id="survey_maker_question_form"></div> <div id="survey_maker_question_form"></div>
</div> </div>
<div class="SurveyMaker-separatorPanel"> <div class="SurveyMaker-separatorPanel" ng-show="job_template_obj.summary_fields.user_capabilities.edit">
<div class="SurveyMaker-contentSeparator"></div> <div class="SurveyMaker-contentSeparator"></div>
</div> </div>
<div class="SurveyMaker-previewPanel"> <div class="SurveyMaker-previewPanel" ng-class="{'SurveyMaker-previewPanel--viewOnly': !job_template_obj.summary_fields.user_capabilities.edit}">
<div style="display: flex; flex-direction: column; width: 100%;"> <div style="display: flex; flex-direction: column; width: 100%;">
<div class="SurveyMaker-panelHeader">PREVIEW</div> <div class="SurveyMaker-panelHeader">PREVIEW</div>
<div class="SurveyMaker-panelBody"> <div class="SurveyMaker-panelBody">
@@ -56,13 +56,13 @@
<i>{{question.question_description}}</i> <i>{{question.question_description}}</i>
</div> </div>
<div class="SurveyMaker-previewInputRow"> <div class="SurveyMaker-previewInputRow">
<span dnd-handle class="SurveyMaker-reorderButton" data-placement="top" aw-tool-tip="Drag to reorder question" data-original-title="" title=""> <span dnd-handle class="SurveyMaker-reorderButton" data-placement="top" aw-tool-tip="Drag to reorder question" data-original-title="" title="" ng-show="job_template_obj.summary_fields.user_capabilities.edit">
<i class="fa fa-ellipsis-v"></i> <i class="fa fa-ellipsis-v"></i>
<span>&nbsp;</span> <span>&nbsp;</span>
<i class="fa fa-ellipsis-v"></i> <i class="fa fa-ellipsis-v"></i>
</span> </span>
<survey-question class="SurveyMaker-previewInput" preview="true" question="question" ng-required="question.required" ng-disabled=true></survey-question> <survey-question class="SurveyMaker-previewInput" preview="true" question="question" ng-required="question.required" ng-disabled=true></survey-question>
<div class="SurveyMaker-previewActions"> <div class="SurveyMaker-previewActions" ng-show="job_template_obj.summary_fields.user_capabilities.edit">
<button class="List-actionButton" data-placement="top" ng-class="{'SurveyMaker-previewActions--selected' : editQuestionIndex == $index}" ng-click="editQuestion($index)" aw-tool-tip="Edit question" data-original-title="" title=""> <button class="List-actionButton" data-placement="top" ng-class="{'SurveyMaker-previewActions--selected' : editQuestionIndex == $index}" ng-click="editQuestion($index)" aw-tool-tip="Edit question" data-original-title="" title="">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</button> </button>
@@ -80,9 +80,10 @@
</div> </div>
<div class="SurveyMaker-panelFooter"> <div class="SurveyMaker-panelFooter">
<div class="Form-buttons"> <div class="Form-buttons">
<button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists" ng-click="showDeleteOverlay('survey')">DELETE SURVEY</button> <button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists && job_template_obj.summary_fields.user_capabilities.edit" ng-click="showDeleteOverlay('survey')">DELETE SURVEY</button>
<button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')">CANCEL</button> <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="job_template_obj.summary_fields.user_capabilities.edit">CANCEL</button>
<button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="survey_questions.length < 1 || !can_edit || editQuestionIndex !== null">SAVE</button> <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="!job_template_obj.summary_fields.user_capabilities.edit">CLOSE</button>
<button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="survey_questions.length < 1 || !can_edit || editQuestionIndex !== null" ng-show="job_template_obj.summary_fields.user_capabilities.edit">SAVE</button>
</div> </div>
</div> </div>
</div> </div>

12
awx/ui/client/src/scheduler/scheduler.controller.js
View File

@@ -14,11 +14,11 @@
export default [ export default [
'$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest',
'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Wait', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Wait',
'Find', 'LoadSchedulesScope', 'GetChoices', '$q', '$state', 'Find', 'LoadSchedulesScope', 'GetChoices', '$q', '$state', 'rbacUiControlService',
function ($scope, $compile, $location, $stateParams, function ($scope, $compile, $location, $stateParams,
SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope, SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
GetBasePath, Wait, Find, LoadSchedulesScope, GetChoices, GetBasePath, Wait, Find, LoadSchedulesScope, GetChoices,
$q, $state) { $q, $state, rbacUiControlService) {
var schedList = _.cloneDeep(SchedulesList); var schedList = _.cloneDeep(SchedulesList);
ClearScope(); ClearScope();
@@ -48,6 +48,14 @@ export default [
} }
$scope.removeParentLoaded = $scope.$on('ParentLoaded', function() { $scope.removeParentLoaded = $scope.$on('ParentLoaded', function() {
url += "schedules/"; url += "schedules/";
$scope.canAdd = false;
rbacUiControlService.canAdd(url)
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
schedList.well = true; schedList.well = true;
// include name of item in listTitle // include name of item in listTitle

1
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@@ -9,7 +9,6 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule',
'Rest', 'ParamPass', 'Rest', 'ParamPass',
function($compile, $filter, $state, $stateParams, AddSchedule, Wait, $scope, function($compile, $filter, $state, $stateParams, AddSchedule, Wait, $scope,
$rootScope, CreateSelect2, ParseTypeChange, GetBasePath, Rest, ParamPass) { $rootScope, CreateSelect2, ParseTypeChange, GetBasePath, Rest, ParamPass) {
$scope.processSchedulerEndDt = function(){ $scope.processSchedulerEndDt = function(){
// set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
var dt = new Date($scope.schedulerUTCTime); var dt = new Date($scope.schedulerUTCTime);

15
awx/ui/client/src/shared/form-generator.js
View File

@@ -865,6 +865,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += ">"; html += ">";
html += "<input type=\"checkbox\" ng-model=\"" + field.subCheckbox.variable + "\" "; html += "<input type=\"checkbox\" ng-model=\"" + field.subCheckbox.variable + "\" ";
html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : ""; html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : "";
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" "; html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" ";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
@@ -987,6 +988,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
if (field.subCheckbox.ngDisabled) { if (field.subCheckbox.ngDisabled) {
html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'"; html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'";
} }
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
html += "</label>"; html += "</label>";
@@ -1084,6 +1086,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
if (field.subCheckbox.ngDisabled) { if (field.subCheckbox.ngDisabled) {
html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'"; html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'";
} }
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
html += "</label>"; html += "</label>";
@@ -1151,6 +1154,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
if (field.subCheckbox.ngDisabled) { if (field.subCheckbox.ngDisabled) {
html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'"; html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'";
} }
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
html += "</label>"; html += "</label>";
@@ -1199,6 +1203,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (field.min || field.min === 0) ? this.attr(field, 'min') : ""; html += (field.min || field.min === 0) ? this.attr(field, 'min') : "";
html += (field.max) ? this.attr(field, 'max') : ""; html += (field.max) ? this.attr(field, 'max') : "";
html += (field.ngChange) ? this.attr(field, 'ngChange') : ""; html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += (field.slider) ? "id=\"" + fld + "-number\"" : (field.id) ? this.attr(field, 'id') : ""; html += (field.slider) ? "id=\"" + fld + "-number\"" : (field.id) ? this.attr(field, 'id') : "";
html += (options.mode === 'edit' && field.editRequired) ? "required " : ""; html += (options.mode === 'edit' && field.editRequired) ? "required " : "";
html += (options.mode === 'add' && field.addRequired) ? "required " : ""; html += (options.mode === 'add' && field.addRequired) ? "required " : "";
@@ -1219,6 +1224,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "<input type=\"checkbox\" ng-model=\"" + html += "<input type=\"checkbox\" ng-model=\"" +
field.subCheckbox.variable + "\" "; field.subCheckbox.variable + "\" ";
html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : ""; html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : "";
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" "; html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" ";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
@@ -1422,6 +1428,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "<input type=\"checkbox\" ng-model=\"" + html += "<input type=\"checkbox\" ng-model=\"" +
field.subCheckbox.variable + "\" "; field.subCheckbox.variable + "\" ";
html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : ""; html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : "";
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" "; html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" ";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
@@ -1693,6 +1700,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
button.label = 'Cancel'; button.label = 'Cancel';
button['class'] = 'Form-cancelButton'; button['class'] = 'Form-cancelButton';
} }
if (btn === 'close') {
button.label = 'Close';
button['class'] = 'Form-cancelButton';
}
if (btn === 'launch') { if (btn === 'launch') {
button.label = 'Launch'; button.label = 'Launch';
button['class'] = 'Form-launchButton'; button['class'] = 'Form-launchButton';
@@ -1705,6 +1716,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
button.label = 'Edit Survey'; button.label = 'Edit Survey';
button['class'] = 'Form-surveyButton'; button['class'] = 'Form-surveyButton';
} }
if (btn === 'view_survey') {
button.label = 'View Survey';
button['class'] = 'Form-surveyButton';
}
// Build button HTML // Build button HTML
html += "<button type=\"button\" "; html += "<button type=\"button\" ";

4
awx/ui/client/src/shared/main.js
View File

@@ -11,12 +11,14 @@ import lodashAsPromised from './lodash-as-promised';
import stringFilters from './string-filters/main'; import stringFilters from './string-filters/main';
import truncatedText from './truncated-text.directive'; import truncatedText from './truncated-text.directive';
import stateExtender from './stateExtender.provider'; import stateExtender from './stateExtender.provider';
import rbacUiControl from './rbacUiControl';
export default export default
angular.module('shared', [listGenerator.name, angular.module('shared', [listGenerator.name,
pagination.name, pagination.name,
stringFilters.name, stringFilters.name,
'ui.router' 'ui.router',
rbacUiControl.name
]) ])
.factory('lodashAsPromised', lodashAsPromised) .factory('lodashAsPromised', lodashAsPromised)
.directive('truncatedText', truncatedText) .directive('truncatedText', truncatedText)

32
awx/ui/client/src/shared/rbacUiControl.js Normal file
View File

@@ -0,0 +1,32 @@
/*************************************************
* Copyright (c) 2015 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
export default
angular.module('rbacUiControl', [])
.service('rbacUiControlService', ['$q', 'GetBasePath', 'Rest', 'Wait', function($q, GetBasePath, Rest, Wait){
this.canAdd = function(apiPath) {
var canAddVal = $q.defer();
if (apiPath.indexOf("api/v1") > -1) {
Rest.setUrl(apiPath);
} else {
Rest.setUrl(GetBasePath(apiPath));
}
Wait("start");
Rest.options()
.success(function(data) {
if (data.actions.POST) {
canAddVal.resolve(true);
} else {
canAddVal.reject(false);
}
Wait("stop");
});
return canAddVal.promise;
};
}]);