From 7395b75c2d4ee4531ba558c7356399559435265d Mon Sep 17 00:00:00 2001 From: brett Date: Mon, 16 Dec 2024 13:56:28 -0800 Subject: [PATCH 1/3] 11689 - Get real path for app paths --- arches/settings_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches/settings_utils.py b/arches/settings_utils.py index b3df5b45d6..e9e349d3e3 100644 --- a/arches/settings_utils.py +++ b/arches/settings_utils.py @@ -149,7 +149,7 @@ def generate_frontend_configuration(): root_dir_path = os.path.realpath(settings.ROOT_DIR) arches_app_names = list_arches_app_names() - arches_app_paths = list_arches_app_paths() + arches_app_paths = [os.path.realpath(path) for path in list_arches_app_paths()] path_lookup = dict(zip(arches_app_names, arches_app_paths, strict=True)) frontend_configuration_settings_data = { From 414d207332cdd50d3fef0854f8dd595b195a5726 Mon Sep 17 00:00:00 2001 From: brett Date: Mon, 16 Dec 2024 14:00:00 -0800 Subject: [PATCH 2/3] 11689 - Add entry to readme --- releases/7.6.4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/releases/7.6.4.md b/releases/7.6.4.md index a6a261cce9..09b8cf61ff 100644 --- a/releases/7.6.4.md +++ b/releases/7.6.4.md @@ -9,6 +9,7 @@ - Cache resource relationship preflabels to improve report load time #[11583](https://github.com/archesproject/arches/issues/11583) - Fix for bug that prevents saving tab name changes in a tabbed report #[11617](https://github.com/archesproject/arches/issues/11617) - Fix regression where Arches is no longer overriding Django admin templates #[11668](https://github.com/archesproject/arches/issues/11668) +- Fix bug causing app resources with symlink in their path to not resolve #[11689](https://github.com/archesproject/arches/issues/11689) - Fix bug causing the Edit button to not display in the map popup #[11679](https://github.com/archesproject/arches/issues/11679) ### Dependency changes: From 68d7b39fbde92c90b1b11a844da42d69dc8f15dc Mon Sep 17 00:00:00 2001 From: Christopher Byrd Date: Mon, 16 Dec 2024 14:51:30 -0800 Subject: [PATCH 3/3] Nit #11689 --- arches/settings_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arches/settings_utils.py b/arches/settings_utils.py index e9e349d3e3..7fa9efa396 100644 --- a/arches/settings_utils.py +++ b/arches/settings_utils.py @@ -35,7 +35,7 @@ def list_arches_app_names(): def list_arches_app_paths(): return [ - config.module.__path__[0] + os.path.realpath(config.module.__path__[0]) for config in apps.get_app_configs() if getattr(config, "is_arches_application", False) ] @@ -149,7 +149,7 @@ def generate_frontend_configuration(): root_dir_path = os.path.realpath(settings.ROOT_DIR) arches_app_names = list_arches_app_names() - arches_app_paths = [os.path.realpath(path) for path in list_arches_app_paths()] + arches_app_paths = list_arches_app_paths() path_lookup = dict(zip(arches_app_names, arches_app_paths, strict=True)) frontend_configuration_settings_data = {