From ec873dd28cf913546e4f3eea35d63d18cda9f71d Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 31 Aug 2018 11:23:11 -0400 Subject: [PATCH] fix LicenseForbids 401/402 precendence for other features --- awx/api/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 2d73816789..ac5e693527 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -115,9 +115,10 @@ class ActivityStreamEnforcementMixin(object): Mixin to check that license supports activity streams. ''' def check_permissions(self, request): + ret = super(ActivityStreamEnforcementMixin, self).check_permissions(request) if not feature_enabled('activity_streams'): raise LicenseForbids(_('Your license does not allow use of the activity stream.')) - return super(ActivityStreamEnforcementMixin, self).check_permissions(request) + return ret class SystemTrackingEnforcementMixin(object): @@ -125,9 +126,10 @@ class SystemTrackingEnforcementMixin(object): Mixin to check that license supports system tracking. ''' def check_permissions(self, request): + ret = super(SystemTrackingEnforcementMixin, self).check_permissions(request) if not feature_enabled('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):