Skip to content

Commit

Permalink
Handle role repositories that do not have a provider_namespace.namesp…
Browse files Browse the repository at this point in the history
…ace (#3062)

* Handle role repositories that do not have a provider_namespace.namespace.
* Fix flake8 error.

No-Issue

Signed-off-by: James Tanner <[email protected]>
  • Loading branch information
jctanner authored Dec 19, 2022
1 parent e0e4b90 commit f204635
Showing 1 changed file with 23 additions and 9 deletions.
32 changes: 23 additions & 9 deletions galaxy/api/serializers/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,29 @@ def get_summary_fields(self, obj):
name=obj.content_type.name,
description=obj.content_type.description)
d['dependencies'] = [str(g) for g in obj.dependencies.all()]
d['namespace'] = dict(
id=obj.repository.provider_namespace.namespace.pk,
name=obj.repository.provider_namespace.namespace.name,
avatar_url=obj.repository.provider_namespace.namespace.avatar_url,
location=obj.repository.provider_namespace.namespace.location,
company=obj.repository.provider_namespace.namespace.company,
email=obj.repository.provider_namespace.namespace.email,
html_url=obj.repository.provider_namespace.namespace.html_url,
is_vendor=obj.repository.provider_namespace.namespace.is_vendor)
if obj.repository.provider_namespace.namespace is not None:
a_url = obj.repository.provider_namespace.namespace.avatar_url,
d['namespace'] = dict(
id=obj.repository.provider_namespace.namespace.pk,
name=obj.repository.provider_namespace.namespace.name,
avatar_url=a_url,
location=obj.repository.provider_namespace.namespace.location,
company=obj.repository.provider_namespace.namespace.company,
email=obj.repository.provider_namespace.namespace.email,
html_url=obj.repository.provider_namespace.namespace.html_url,
is_vendor=obj.repository.provider_namespace.namespace.is_vendor
)
else:
d['namespace'] = dict(
id=None,
name=None,
avatar_url=None,
location=None,
company=None,
email=None,
html_url=None,
is_vendor=None
)
d['platforms'] = [
dict(name=g.name, release=g.release) for g in obj.platforms.all()]
d['provider_namespace'] = dict(
Expand Down

0 comments on commit f204635

Please sign in to comment.