# HG changeset patch
# User bsw
# Date 1632733106 -7200
# Node ID cd3b521dc735704c75b493e35dcd4d4f4ce3f1cc
# Parent  5eb8b596f7d48d9f0d62f5a46ddaf301a81fe1d9# Parent  b2868d84275e909a9db394eb057919d42755a05a
merge

diff -r 5eb8b596f7d4 -r cd3b521dc735 app/main/index/_head.lua
--- a/app/main/index/_head.lua	Mon Sep 27 10:58:14 2021 +0200
+++ b/app/main/index/_head.lua	Mon Sep 27 10:58:26 2021 +0200
@@ -1,4 +1,4 @@
-local unit_id = app.single_unit_id or request.get_param{ name = "unit" }
+local unit_id = config.single_unit_id or request.get_param{ name = "unit" } or app.single_unit_id
 local area_id = config.single_area_id or request.get_param{ name = "area" }
 
 local initiative = param.get("initiative", "table")
diff -r 5eb8b596f7d4 -r cd3b521dc735 app/main/issue/_filters.lua
--- a/app/main/issue/_filters.lua	Mon Sep 27 10:58:14 2021 +0200
+++ b/app/main/issue/_filters.lua	Mon Sep 27 10:58:26 2021 +0200
@@ -5,7 +5,7 @@
 local member = param.get("member", "table")
 local phase = request.get_param{ name = "phase" }
 
-local selected_unit_id = app.single_unit_id or request.get_param{ name = "unit" }
+local selected_unit_id = config.single_unit_id or request.get_param{ name = "unit" } or app.single_unit_id
 if selected_unit_id == "all" then
   selected_unit_id = nil 
 end