Skip to content

Partner types only returned if they have a partner #1183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2021
Merged

Partner types only returned if they have a partner #1183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49cfe56
Partner types only returned if they have a partner
edwoodward Jul 7, 2021
b390e49
Merge branch 'master' into partner-type-fix
mwvolo Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pages/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,7 +2253,14 @@ def field_name_mapping():

@staticmethod
def partner_type_choices():
return [x.display_name for x in PartnerTypeMapping.objects.all()]
partner_types_array = []
partner_type_mappings = PartnerTypeMapping.objects.all()
types_from_partners = Partner.objects.values_list('partner_type', flat=True).exclude(partner_type__isnull=True)
for partner_type in partner_type_mappings:
if any(p_type.lower().startswith(partner_type.display_name.lower()) for p_type in types_from_partners):
partner_types_array.append(partner_type.display_name)

return partner_types_array

content_panels = [
FieldPanel('title', classname='full title', help_text="Internal name for page."),
Expand Down