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

Emit approve/deny status for websockets, update doc string + a comment

Browse Source
This commit is contained in:
beeankha
2019-08-13 20:50:08 -04:00
committed by Ryan Petrello
parent 761dad060c
commit f7d6f4538c
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/access.py
View File

@@ -134,7 +134,7 @@ def check_user_access_with_errors(user, model_class, action, *args, **kwargs):
access_instance = access_class(user, save_messages=True)
access_method = getattr(access_instance, 'can_%s' % action, None)
result = access_method(*args, **kwargs)
logger.debug('%s.%s %r returned %r', access_instance.__class__.__name__,
logger.error('%s.%s %r returned %r', access_instance.__class__.__name__,
access_method.__name__, args, result)
return (result, access_instance.messages)
@@ -2824,13 +2824,18 @@ class WorkflowApprovalTemplateAccess(BaseAccess):
@check_superuser
def can_add(self, data):
'''
A user can create an approval template if they are a superuser, an org admin
of the org connected to the workflow, or if they are assigned as admins to
the workflow.
'''
if data is None: # Hide direct creation in API browser
return False
else:
return (self.check_related('workflow_approval_template', UnifiedJobTemplate, role_field='admin_role'))
def can_start(self, obj, validate_license=False):
# Super users can start any job
# for copying WFJTs that contain approval nodes
if self.user.is_superuser:
return True