diff --git a/src/pretix/control/templates/pretixcontrol/organizers/reusable_media.html b/src/pretix/control/templates/pretixcontrol/organizers/reusable_media.html index f481e01cf4..e0f89f836f 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/reusable_media.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/reusable_media.html @@ -82,13 +82,13 @@ {% endif %} - {% if m.linked_orderposition %} + {% for op in m.linked_orderpositions.all %} - - {{ m.linked_orderposition.order.code }}-{{ m.linked_orderposition.positionid }} + + {{ op.order.code }}-{{ op.positionid }} - {% endif %} + {% endfor %} {% if m.linked_giftcard %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/reusable_medium.html b/src/pretix/control/templates/pretixcontrol/organizers/reusable_medium.html index 66ea2d2804..f2d3250ce4 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/reusable_medium.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/reusable_medium.html @@ -49,13 +49,13 @@ {% endif %} - {% if medium.linked_orderposition %} + {% for op in medium.linked_orderpositions.all %} - - {{ medium.linked_orderposition.order.code }}-{{ medium.linked_orderposition.positionid }} + + {{ op.order.code }}-{{ op.positionid }} - {% endif %} + {% endfor %} {% if medium.linked_giftcard %} diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py index 146ef96a48..56f5f70715 100644 --- a/src/pretix/control/views/organizer.py +++ b/src/pretix/control/views/organizer.py @@ -3338,8 +3338,10 @@ class ReusableMediaListView(OrganizerDetailViewMixin, OrganizerPermissionRequire def get_queryset(self): qs = self.request.organizer.reusable_media.select_related( - 'customer', 'linked_orderposition', 'linked_orderposition__order', 'linked_orderposition__order__event', - 'linked_giftcard' + 'customer', + 'linked_giftcard', + ).prefetch_related( + Prefetch('linked_orderpositions', queryset=OrderPosition.objects.select_related("order", "order__event")) ) if self.filter_form.is_valid(): qs = self.filter_form.filter_qs(qs)