From f94a089a6635046e49f28a109efba49eab41784a Mon Sep 17 00:00:00 2001 From: njkim Date: Fri, 6 Dec 2024 10:39:48 -0800 Subject: [PATCH 1/2] Move down django admin in installed app, #11668 --- .../install/arches-templates/project_name/settings.py-tpl | 2 +- arches/settings.py | 2 +- releases/7.6.4.md | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arches/install/arches-templates/project_name/settings.py-tpl b/arches/install/arches-templates/project_name/settings.py-tpl index 332f545a68d..d118206106a 100644 --- a/arches/install/arches-templates/project_name/settings.py-tpl +++ b/arches/install/arches-templates/project_name/settings.py-tpl @@ -125,7 +125,6 @@ SEARCH_THUMBNAILS = False INSTALLED_APPS = ( "webpack_loader", - "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.sessions", @@ -149,6 +148,7 @@ INSTALLED_APPS = ( # Placing this last ensures any templates provided by Arches Applications # take precedence over core arches templates in arches/app/templates. INSTALLED_APPS += ("arches.app",) +INSTALLED_APPS += ("django.contrib.admin",) MIDDLEWARE = [ "corsheaders.middleware.CorsMiddleware", diff --git a/arches/settings.py b/arches/settings.py index c304b9159f0..27457b409f2 100644 --- a/arches/settings.py +++ b/arches/settings.py @@ -355,7 +355,6 @@ INSTALLED_APPS = ( "webpack_loader", - "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.sessions", @@ -377,6 +376,7 @@ # Placing this last ensures any templates provided by Arches Applications # take precedence over core arches templates in arches/app/templates. INSTALLED_APPS += ("arches.app",) +INSTALLED_APPS += ("django.contrib.admin",) MIDDLEWARE = [ "corsheaders.middleware.CorsMiddleware", diff --git a/releases/7.6.4.md b/releases/7.6.4.md index 202f95690e1..482818292bf 100644 --- a/releases/7.6.4.md +++ b/releases/7.6.4.md @@ -33,3 +33,9 @@ JavaScript: ``` sudo service apache2 reload ``` + +4. Remove "django.contrib.admin" from INSTALLED_APPS and add the following after INSTALLED_APPS + ``` + INSTALLED_APPS += ("arches.app",) + INSTALLED_APPS += ("django.contrib.admin",) + ``` From a2435af0180a172514551da4ab7d442b75bbd023 Mon Sep 17 00:00:00 2001 From: njkim Date: Fri, 6 Dec 2024 10:56:51 -0800 Subject: [PATCH 2/2] Update the release note, #11668 --- releases/7.6.4.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/releases/7.6.4.md b/releases/7.6.4.md index 482818292bf..6d65a98db2d 100644 --- a/releases/7.6.4.md +++ b/releases/7.6.4.md @@ -29,13 +29,14 @@ JavaScript: pip install --upgrade arches==7.6.4 ``` -3. If you are running Arches on Apache, restart your server: +3. Remove "django.contrib.admin" from INSTALLED_APPS and add the following after INSTALLED_APPS ``` - sudo service apache2 reload + INSTALLED_APPS += ("arches.app",) + INSTALLED_APPS += ("django.contrib.admin",) ``` -4. Remove "django.contrib.admin" from INSTALLED_APPS and add the following after INSTALLED_APPS +4. If you are running Arches on Apache, restart your server: ``` - INSTALLED_APPS += ("arches.app",) - INSTALLED_APPS += ("django.contrib.admin",) + sudo service apache2 reload ``` +