From 44e948dbef10d0479f1b842ab2934155042a9a6f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 14 2018 14:14:06 +0000 Subject: [PATCH 1/2] Ensure the key is present in the dict before calling it Older project managed to get '' as milestone which has since been blocked and those milestones are cleaned, so just be sure it exists before calling it. Fixes https://pagure.io/pagure/issue/3913 Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index fa7a12c..9db1eb5 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -878,7 +878,7 @@ def new_issue(repo, username=None, namespace=None): milestones = [] for m in repo.milestones_keys or repo.milestones: - if repo.milestones[m]["active"]: + if m in repo.milestones and repo.milestones[m]["active"]: milestones.append(m) form = pagure.forms.IssueFormSimplied( From 7c1589d013e11df6fa5a8edd33a0783888eed984 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 14 2018 14:15:21 +0000 Subject: [PATCH 2/2] Small code style change to make the code more obvious Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 9db1eb5..2c734a5 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -877,7 +877,7 @@ def new_issue(repo, username=None, namespace=None): open_access = repo.settings.get("open_metadata_access_to_all", False) milestones = [] - for m in repo.milestones_keys or repo.milestones: + for m in (repo.milestones_keys or repo.milestones): if m in repo.milestones and repo.milestones[m]["active"]: milestones.append(m) @@ -1080,7 +1080,7 @@ def view_issue(repo, issueid, username=None, namespace=None): status = pagure.lib.query.get_issue_statuses(flask.g.session) milestones = [] - for m in repo.milestones_keys or repo.milestones: + for m in (repo.milestones_keys or repo.milestones): if m in repo.milestones and repo.milestones[m]["active"]: milestones.append(m)