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

Merge pull request #2966 from ryanpetrello/fix-2950

Browse Source 
fix LicenseForbids 401/402 precendence for other features
This commit is contained in:
Ryan Petrello
2018-08-31 12:00:50 -04:00
committed by GitHub
parent c2bd36e580 ec873dd28c
commit 2f2294b65a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -115,9 +115,10 @@ class ActivityStreamEnforcementMixin(object):
Mixin to check that license supports activity streams. Mixin to check that license supports activity streams.
''' '''
def check_permissions(self, request): def check_permissions(self, request):
ret = super(ActivityStreamEnforcementMixin, self).check_permissions(request)
if not feature_enabled('activity_streams'): if not feature_enabled('activity_streams'):
raise LicenseForbids(_('Your license does not allow use of the activity stream.')) raise LicenseForbids(_('Your license does not allow use of the activity stream.'))
return super(ActivityStreamEnforcementMixin, self).check_permissions(request) return ret
class SystemTrackingEnforcementMixin(object): class SystemTrackingEnforcementMixin(object):
@@ -125,9 +126,10 @@ class SystemTrackingEnforcementMixin(object):
Mixin to check that license supports system tracking. Mixin to check that license supports system tracking.
''' '''
def check_permissions(self, request): def check_permissions(self, request):
ret = super(SystemTrackingEnforcementMixin, self).check_permissions(request)
if not feature_enabled('system_tracking'): if not feature_enabled('system_tracking'):
raise LicenseForbids(_('Your license does not permit use of system tracking.')) raise LicenseForbids(_('Your license does not permit use of system tracking.'))
return super(SystemTrackingEnforcementMixin, self).check_permissions(request) return ret
class WorkflowsEnforcementMixin(object): class WorkflowsEnforcementMixin(object):