From 696bd594464569b9808ef58be904dc00b12e8e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Mon, 14 Jun 2021 18:27:33 +0200
Subject: [PATCH] elections2021: New address for foreign ministry
---
elections2021/constants.py | 2 +-
elections2021/models.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/elections2021/constants.py b/elections2021/constants.py
index ef3609dd..c39b48e1 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 f9731175..4d5695cf 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,)
)
--
GitLab