External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-08 06:48:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4718 from AlanCoding/more_simple_relaunch

Browse Source 
require constituent resource access to relaunch WJ
This commit is contained in:
Alan Rominger
2017-01-17 15:02:10 -05:00
committed by GitHub
parent bfe17f3bfc ba8f0ccff1
commit 8433f647ec
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/access.py
View File

@@ -1655,11 +1655,6 @@ class WorkflowJobAccess(BaseAccess):
if self.user not in wfjt.execute_role:
return False
# WFJT is valid base for WJ, launch permitted
last_modified = wfjt.nodes_last_modified()
if last_modified and obj.created > last_modified:
return True
# user's WFJT access doesn't guarentee permission to launch, introspect nodes
return self.can_recreate(obj)
@@ -1671,8 +1666,8 @@ class WorkflowJobAccess(BaseAccess):
if not node_access.can_add({'reference_obj': node}):
wj_add_perm = False
if not wj_add_perm and self.save_messages:
self.messages['workflow_job_template'] = _('Template has been modified since job was launched, '
'and you do not have permission to its resources.')
self.messages['workflow_job_template'] = _('You do not have permission to the workflow job '
'resources required for relaunch.')
return wj_add_perm
def can_cancel(self, obj):