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

Define a DEFAULT_QUEUE_NAME

Browse Source
This commit is contained in:
Yanis Guenane
2021-05-17 18:06:00 +02:00
committed by Shane McDonald
parent d3b20e6585
commit 82c4f6bb88
10 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/permissions.py
View File

@@ -4,6 +4,8 @@
# Python
import logging
from django.conf import settings
# Django REST Framework
from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
from rest_framework import permissions
@@ -245,7 +247,7 @@ class IsSuperUser(permissions.BasePermission):
class InstanceGroupTowerPermission(ModelAccessPermission):
def has_object_permission(self, request, view, obj):
if request.method == 'DELETE' and obj.name == "tower":
if request.method == 'DELETE' and obj.name == settings.DEFAULT_QUEUE_NAME:
return False
return super(InstanceGroupTowerPermission, self).has_object_permission(request, view, obj)

4
awx/api/serializers.py
View File

@@ -4918,8 +4918,8 @@ class InstanceGroupSerializer(BaseSerializer):
return value
def validate_name(self, value):
if self.instance and self.instance.name == 'tower' and value != 'tower':
raise serializers.ValidationError(_('tower instance group name may not be changed.'))
if self.instance and self.instance.name == settings.DEFAULT_QUEUE_NAME and value != settings.DEFAULT_QUEUE_NAME:
raise serializers.ValidationError(_('%s instance group name may not be changed.' % settings.DEFAULT_QUEUE_NAME))
return value
def validate_credential(self, value):