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

Simplify code that generates named URLS

Browse Source
This commit is contained in:
Shane McDonald
2021-11-16 10:15:15 +00:00
parent 2abab0772f
commit 489ee30e54
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/api/serializers.py
View File

@@ -379,32 +379,22 @@ class BaseSerializer(serializers.ModelSerializer, metaclass=BaseSerializerMetacl
def _get_related(self, obj): def _get_related(self, obj):
return {} if obj is None else self.get_related(obj) return {} if obj is None else self.get_related(obj)
def _generate_named_url(self, url_path, obj, node): def _generate_friendly_id(self, obj, node):
url_units = url_path.split('/')
reset_counters() reset_counters()
named_url = node.generate_named_url(obj) return node.generate_named_url(obj)
url_units[4] = named_url
return '/'.join(url_units)
def get_related(self, obj): def get_related(self, obj):
res = OrderedDict() res = OrderedDict()
view = self.context.get('view', None) view = self.context.get('view', None)
if view and (hasattr(view, 'retrieve') or view.request.method == 'POST') and type(obj) in settings.NAMED_URL_GRAPH: if view and (hasattr(view, 'retrieve') or view.request.method == 'POST') and type(obj) in settings.NAMED_URL_GRAPH:
original_url = self.get_url(obj) original_path = self.get_url(obj)
path_components = original_path.lstrip('/').rstrip('/').split('/')
# If the app is running at a location other than /, temporarily remove the friendly_id = self._generate_friendly_id(obj, settings.NAMED_URL_GRAPH[type(obj)])
# prefix. This is to avoid changing the code in _generate_named_url where path_components[-1] = friendly_id
# it is assumed the ID of the resource is at url_units[4].
url_prefix = view.request.META.get('SCRIPT_NAME', '')
if url_prefix:
original_url = removeprefix(original_url, url_prefix)
named_url = self._generate_named_url(original_url, obj, settings.NAMED_URL_GRAPH[type(obj)]) new_path = '/' + '/'.join(path_components) + '/'
res['named_url'] = new_path
if url_prefix:
named_url = url_prefix + named_url
res['named_url'] = named_url
if getattr(obj, 'created_by', None): if getattr(obj, 'created_by', None):
res['created_by'] = self.reverse('api:user_detail', kwargs={'pk': obj.created_by.pk}) res['created_by'] = self.reverse('api:user_detail', kwargs={'pk': obj.created_by.pk})
if getattr(obj, 'modified_by', None): if getattr(obj, 'modified_by', None):