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

Merge pull request #5896 from mabashian/5894-workflow-permissions

Browse Source 
Fixed workflow admin permissions bug
This commit is contained in:
Michael Abashian
2017-03-27 12:55:27 -04:00
committed by GitHub
parent e750f1a01c fd95c1e6e4
commit e5bd641a20
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
View File

@@ -207,7 +207,7 @@ export default [ '$state','moment', '$timeout', '$window',
} }
function update() { function update() {
let userCanAddEdit = (scope.workflowJobTemplateObjt && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate; let userCanAddEdit = (scope.workflowJobTemplateObj && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate;
if(scope.dimensionsSet) { if(scope.dimensionsSet) {
// Declare the nodes // Declare the nodes
let nodes = tree.nodes(scope.treeData), let nodes = tree.nodes(scope.treeData),
@@ -813,7 +813,7 @@ export default [ '$state','moment', '$timeout', '$window',
function add_node() { function add_node() {
this.on("click", function(d) { this.on("click", function(d) {
if((scope.workflowJobTemplateObjt && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) { if((scope.workflowJobTemplateObj && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) {
scope.addNode({ scope.addNode({
parent: d, parent: d,
betweenTwoNodes: false betweenTwoNodes: false
@@ -824,7 +824,7 @@ export default [ '$state','moment', '$timeout', '$window',
function add_node_between() { function add_node_between() {
this.on("click", function(d) { this.on("click", function(d) {
if((scope.workflowJobTemplateObjt && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) { if((scope.workflowJobTemplateObj && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) {
scope.addNode({ scope.addNode({
parent: d, parent: d,
betweenTwoNodes: true betweenTwoNodes: true
@@ -835,7 +835,7 @@ export default [ '$state','moment', '$timeout', '$window',
function remove_node() { function remove_node() {
this.on("click", function(d) { this.on("click", function(d) {
if((scope.workflowJobTemplateObjt && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) { if((scope.workflowJobTemplateObj && scope.workflowJobTemplateObj.summary_fields && scope.workflowJobTemplateObj.summary_fields.user_capabilities && scope.workflowJobTemplateObj.summary_fields.user_capabilities.edit) || scope.canAddWorkflowJobTemplate) {
scope.deleteNode({ scope.deleteNode({
nodeToDelete: d nodeToDelete: d
}); });