mirror of
https://github.com/ansible/awx.git
synced 2026-05-20 07:17:40 -02:30
Pick up workflow cornercase in get_user_capabilities
This commit is contained in:
@@ -22,7 +22,7 @@ from awx.main.models import * # noqa
|
|||||||
from awx.main.models.unified_jobs import ACTIVE_STATES
|
from awx.main.models.unified_jobs import ACTIVE_STATES
|
||||||
from awx.main.models.mixins import ResourceMixin
|
from awx.main.models.mixins import ResourceMixin
|
||||||
|
|
||||||
from awx.conf.license import LicenseForbids
|
from awx.conf.license import LicenseForbids, feature_enabled
|
||||||
|
|
||||||
__all__ = ['get_user_queryset', 'check_user_access', 'check_user_access_with_errors',
|
__all__ = ['get_user_queryset', 'check_user_access', 'check_user_access_with_errors',
|
||||||
'user_accessible_objects', 'consumer_access',
|
'user_accessible_objects', 'consumer_access',
|
||||||
@@ -304,6 +304,10 @@ class BaseAccess(object):
|
|||||||
if validation_errors:
|
if validation_errors:
|
||||||
user_capabilities[display_method] = False
|
user_capabilities[display_method] = False
|
||||||
continue
|
continue
|
||||||
|
elif isinstance(obj, (WorkflowJobTemplate, WorkflowJob)):
|
||||||
|
if not feature_enabled('workflows'):
|
||||||
|
user_capabilities[display_method] = (display_method == 'delete')
|
||||||
|
continue
|
||||||
elif display_method == 'copy' and isinstance(obj, WorkflowJobTemplate) and obj.organization_id is None:
|
elif display_method == 'copy' and isinstance(obj, WorkflowJobTemplate) and obj.organization_id is None:
|
||||||
user_capabilities[display_method] = self.user.is_superuser
|
user_capabilities[display_method] = self.user.is_superuser
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user