diff --git a/elections2021/constants.py b/elections2021/constants.py index ef3609dd8f61f5fbc8b475f48e46e58fb4f37b14..c39b48e1d94d19d4a555c6316b680c7707c7d550 100644 --- a/elections2021/constants.py +++ b/elections2021/constants.py @@ -203,7 +203,7 @@ MINISTRY_BUSINESS = "prumysl-a-obchod" MINISTRY_JUSTICE = "spravedlnost" MINISTRY_SCHOOLS = "skolstvi-mladez-a-telovychova" MINISTRY_INTERIOR = "vnitro" -MINISTRY_FOREIGN = "zahranicni-veci" +MINISTRY_FOREIGN = "eu-zahranici-obrana" MINISTRY_HEALTH = "zdravotnictvi" MINISTRY_AGRICULTURE = "zemedelstvi" MINISTRY_ENVIRONMENT = "zivotni-prostredi" diff --git a/elections2021/models.py b/elections2021/models.py index f97311750dba942e833d2d75468b94d6e1061586..4d5695cff706bc6bd6e41cbac8ef106c1fa2a830 100644 --- a/elections2021/models.py +++ b/elections2021/models.py @@ -1222,8 +1222,9 @@ class Elections2021ProgramPage( @route(r"^resort/([a-z-]+)/$") def ministry_detail(self, request, param=None): - # obrana zrušená, přesměrovává se na zahraničí - if param == MINISTRY_DEFENSE: + # obrana a zahraničí sloučeny a přesměrovává se na "nové" zahraničí se + # změněnou adresou na "eu-zahranici-obrana" + if param in ["obrana", "zahranicni-veci"]: url = self.url + self.reverse_subpage( "ministry_detail", args=(MINISTRY_FOREIGN,) )