diff --git a/aleksis/apps/resint/models.py b/aleksis/apps/resint/models.py index c42edc8538f32b9ee44e89862ec06e09bfa08fbc..aae47aa1693869acd96a5e25b6cd7d7e29a86f98 100644 --- a/aleksis/apps/resint/models.py +++ b/aleksis/apps/resint/models.py @@ -28,29 +28,29 @@ class PosterGroupDynamicRoute(DynamicRoute): dynamic_routes = [] for poster_group in poster_groups: - dynamic_routes.append(cls.get_route_data(poster_group)) + dynamic_routes.append(cls.get_route_data(poster_group)) return dynamic_routes @classmethod def get_route_data(cls, instance): - dynamic_route = {} + dynamic_route = {} - dynamic_route["parent_route_name"] = "" + dynamic_route["parent_route_name"] = "" - dynamic_route["route_path"] = reverse("poster_show_current", args=[instance.slug]) - dynamic_route["route_name"] = f"resint.posterGroup.{instance.slug}" + dynamic_route["route_path"] = reverse("poster_show_current", args=[instance.slug]) + dynamic_route["route_name"] = f"resint.posterGroup.{instance.slug}" - dynamic_route["display_account_menu"] = False - dynamic_route["display_sidenav_menu"] = instance.show_in_menu - dynamic_route["menu_new_tab"] = True + dynamic_route["display_account_menu"] = False + dynamic_route["display_sidenav_menu"] = instance.show_in_menu + dynamic_route["menu_new_tab"] = True - dynamic_route["menu_title"] = instance.name - dynamic_route["menu_icon"] = "mdi-file-pdf-box" + dynamic_route["menu_title"] = instance.name + dynamic_route["menu_icon"] = "mdi-file-pdf-box" - dynamic_route["route_permission"] = "" if instance.public else "resint.view_poster_pdf_menu" + dynamic_route["route_permission"] = "" if instance.public else "resint.view_poster_pdf_menu" - return dynamic_route + return dynamic_route class PosterGroup(ExtensibleModel): @@ -58,7 +58,7 @@ class PosterGroup(ExtensibleModel): slug = models.SlugField( verbose_name=_("Slug used in URL name"), - help_text=_("If you use 'example', the filename will be 'example.pdf'.") + help_text=_("If you use 'example', the filename will be 'example.pdf'."), ) name = models.CharField(max_length=255, verbose_name=_("Name")) publishing_day = models.PositiveSmallIntegerField( @@ -79,8 +79,8 @@ class PosterGroup(ExtensibleModel): verbose_name = _("Poster group") verbose_name_plural = _("Poster groups") constraints = [ - models.UniqueConstraint(fields=["site_id", "name"], name="unique_site_name"), - models.UniqueConstraint(fields=["site_id", "slug"], name="unique_site_slug"), + models.UniqueConstraint(fields=["site_id", "name"], name="unique_site_name"), + models.UniqueConstraint(fields=["site_id", "slug"], name="unique_site_slug"), ] permissions = [ ("view_poster_of_group", _("Can view all posters of this group")), @@ -92,7 +92,6 @@ class PosterGroup(ExtensibleModel): def __str__(self) -> str: return f"{self.name} ({self.publishing_day_name}, {self.publishing_time})" - @property def publishing_day_name(self) -> str: """Return the full name of the publishing day (e. g. Monday).""" diff --git a/aleksis/apps/resint/rules.py b/aleksis/apps/resint/rules.py index 57b9d6100cc420ee1f82700911cdeeb6f66fff05..a30a6811217ffa0317732bfebd2a93862f44ed14 100644 --- a/aleksis/apps/resint/rules.py +++ b/aleksis/apps/resint/rules.py @@ -104,8 +104,7 @@ add_perm("resint.view_poster_pdf", view_poster_pdf_predicate) # View poster PDF file in menu view_poster_pdf_menu_predicate = has_person & ( - has_global_perm("resint.view_postergroup") - | has_global_perm("resint.view_poster") + has_global_perm("resint.view_postergroup") | has_global_perm("resint.view_poster") ) add_perm("resint.view_poster_pdf_menu", view_poster_pdf_menu_predicate)