Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix enabling multiple languages if the APP_NAME in the db was "Arches" #11660 #11687

Merged
merged 4 commits into from
Dec 19, 2024
Merged

Fix enabling multiple languages if the APP_NAME in the db was "Arches" #11660 #11687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
821e901
Use same guard for "last" project as project-level urls.py #11660
jacobtylerwalls Dec 13, 2024
fbc966a
Update system settings from db in development also #11660
jacobtylerwalls Dec 13, 2024
cbd60c1
Revert "Update system settings from db in development also #11660"
jacobtylerwalls Dec 14, 2024
feea889
Use better heuristic for running core arches directly re #11660
jacobtylerwalls Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion arches/settings_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,10 @@ def generate_frontend_configuration():
"WEBPACK_DEVELOPMENT_SERVER_PORT": settings.WEBPACK_DEVELOPMENT_SERVER_PORT,
}

if settings.APP_NAME == "Arches":
if str(Path(app_root_path).parent) == root_dir_path:
# Running core arches directly without a project, e.g.:
# app_root_path: arches/app
# root_dir_path: arches
base_path = root_dir_path
else:
base_path = app_root_path
Expand Down
2 changes: 1 addition & 1 deletion arches/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@

# This must be included in core to keep webpack happy, but cannot be appended when running a project.
# See https://github.com/archesproject/arches/pull/10754
if settings.APP_NAME == "Arches":
if settings.ROOT_URLCONF == __name__:
if settings.SHOW_LANGUAGE_SWITCH is True:
urlpatterns = i18n_patterns(*urlpatterns)

Expand Down
1 change: 1 addition & 0 deletions releases/7.6.4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Cache resource relationship preflabels to improve report load time #[11583](https://github.com/archesproject/arches/issues/11583)
- Fix regression where Arches is no longer overriding Django admin templates #[11668](https://github.com/archesproject/arches/issues/11668)
- Fix bug causing the Edit button to not display in the map popup #[11679](https://github.com/archesproject/arches/issues/11679)
- Fix enabling multiple languages if the `APP_NAME` system settings tile had never been updated #[11660](https://github.com/archesproject/arches/issues/11660)

### Dependency changes:

Expand Down
Loading