diff --git a/AKModel/views/manage.py b/AKModel/views/manage.py index 8e1e7fa426a66f775b454da38c599c26ced29970..d947bfc39e4cf461195781afc6119cb00982d725 100644 --- a/AKModel/views/manage.py +++ b/AKModel/views/manage.py @@ -82,7 +82,8 @@ class ExportSlidesView(EventSlugMixin, IntermediateAdminView): # Get all relevant AKs (wishes separately, and either all AKs or only those who should directly or indirectly # be presented when restriction setting was chosen) categories_with_aks, ak_wishes = self.event.get_categories_with_aks(wishes_seperately=True, filter_func=lambda - ak: not RESULT_PRESENTATION_MODE or (ak.present or (ak.present is None and ak.category.present_by_default)), types=types) + ak: not RESULT_PRESENTATION_MODE or (ak.present or (ak.present is None and ak.category.present_by_default)), + types=types) # Create context for LaTeX rendering context = { diff --git a/AKPlan/views.py b/AKPlan/views.py index 1eac54ef513c3fefb6bceac2e949eaae295758e4..6dfc96b701df9c7edf9e25b0c6ac1230579c9dde 100644 --- a/AKPlan/views.py +++ b/AKPlan/views.py @@ -74,7 +74,6 @@ class PlanIndexView(FilterByEventSlugMixin, ListView): :param akslot: current slot :type akslot: AKSlot """ - pass class PlanScreenView(PlanIndexView): diff --git a/AKSubmission/templatetags/tags_AKSubmission.py b/AKSubmission/templatetags/tags_AKSubmission.py index c9af733c6c63096ccb00fec28c806bdc74f4ccc6..2f24287d5abfdaa3b7917a85ff41ca18852f5098 100644 --- a/AKSubmission/templatetags/tags_AKSubmission.py +++ b/AKSubmission/templatetags/tags_AKSubmission.py @@ -52,11 +52,11 @@ def category_linked_badge(category, event_slug): @register.inclusion_tag("AKSubmission/type_linked_badge.html") -def type_linked_badge(type, event_slug): +def type_linked_badge(ak_type, event_slug): """ Generate a clickable type badge based upon the type_linked_badge template - :param type: type to show/link + :param ak_type: type to show/link :param event_slug: slug of this event, required for link creation :return: html fragment containing badge """ - return {"type": type, "event_slug": event_slug} + return {"type": ak_type, "event_slug": event_slug}