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

Merge pull request #405 from ryanpetrello/fix-7568

Browse Source 
defer UnifiedJob.result_stdout_text for improved performance
This commit is contained in:
Ryan Petrello
2017-09-12 19:04:37 -04:00
committed by GitHub
parent bd088d31ca bd42dfe474
commit 66d78bca8a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/access.py
View File

@@ -105,7 +105,14 @@ def get_user_capabilities(user, instance, **kwargs):
convenient for the user interface to consume and hide or show various convenient for the user interface to consume and hide or show various
actions in the interface. actions in the interface.
''' '''
access_class = access_registry[instance.__class__] cls = instance.__class__
# When `.defer()` is used w/ the Django ORM, the result is a subclass of
# the original that represents e.g.,
# awx.main.models.ad_hoc_commands.AdHocCommand_Deferred_result_stdout_text
# We want to do the access registry lookup keyed on the base class name.
if getattr(cls, '_deferred', False):
cls = instance.__class__.__bases__[0]
access_class = access_registry[cls]
return access_class(user).get_user_capabilities(instance, **kwargs) return access_class(user).get_user_capabilities(instance, **kwargs)
@@ -2071,6 +2078,7 @@ class UnifiedJobAccess(BaseAccess):
# 'job_template__project', # 'job_template__project',
# 'job_template__credential', # 'job_template__credential',
#) #)
qs = qs.defer('result_stdout_text')
return qs.all() return qs.all()