nit #11001

arches/install/arches-templates/project_name/settings.py-tpl

@@ -157,7 +157,6 @@ ARCHES_APPLICATIONS = ()
 INSTALLED_APPS += ARCHES_APPLICATIONS
 
 MIDDLEWARE = [
-    "django_hosts.middleware.HostsRequestMiddleware",  # this _must_ be first MIDDLEWARE entry
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -174,7 +173,14 @@ MIDDLEWARE = [
     # "silk.middleware.SilkyMiddleware",
 ]
 
-MIDDLEWARE.append('django_hosts.middleware.HostsResponseMiddleware')  # this _must_ be last MIDDLEWARE entry
+MIDDLEWARE.insert(  # this must resolve to first MIDDLEWARE entry
+    0, 
+    "django_hosts.middleware.HostsRequestMiddleware"
+)
+
+MIDDLEWARE.append(  # this must resolve last MIDDLEWARE entry
+    "django_hosts.middleware.HostsResponseMiddleware"
+)  
 
 STATICFILES_DIRS = build_staticfiles_dirs(
     root_dir=ROOT_DIR,

arches/install/arches-templates/project_name/urls.py-tpl

@@ -4,8 +4,14 @@ from django.conf.urls.i18n import i18n_patterns
 from django.urls import include, path
 
 urlpatterns = [
-    path('', include('arches.urls')),  # ensure project and Arches-application urls go _above_ this entry
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    # project-level urls
+]
+
+# Ensure Arches core urls are superceded by project-level urls
+urlpatterns.append(path('', include('arches.urls')))
+
+# Adds URL pattern to serve media files during development
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # Only handle i18n routing in active project. This will still handle the routes provided by Arches core and Arches applications,
 # but handling i18n routes in multiple places causes application errors.

arches/settings.py

@@ -380,7 +380,6 @@
 INSTALLED_APPS += ARCHES_APPLICATIONS
 
 MIDDLEWARE = [
-    "django_hosts.middleware.HostsRequestMiddleware",  # this _must_ be first MIDDLEWARE entry
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -396,9 +395,13 @@
     "arches.app.utils.middleware.SetAnonymousUser",
 ]
 
-MIDDLEWARE.append(
+MIDDLEWARE.insert(  # this must resolve to first MIDDLEWARE entry
+    0, "django_hosts.middleware.HostsRequestMiddleware"
+)
+
+MIDDLEWARE.append(  # this must resolve last MIDDLEWARE entry
     "django_hosts.middleware.HostsResponseMiddleware"
-)  # this _must_ be last MIDDLEWARE entry
+)
 
 WEBPACK_LOADER = {
     "DEFAULT": {

releases/7.6.0.md

@@ -320,49 +320,55 @@ Minor incompatibilities:
         DEFAULT_HOST = "{{ project_name }}"
         ```
 
-    4. Add the following line to the *top* of `MIDDLEWARE`:
+    4. Add the following lines *after* `MIDDLEWARE`:
         ```
-        "django_hosts.middleware.HostsRequestMiddleware",  # this _must_ be first MIDDLEWARE entry
+        MIDDLEWARE.insert(  # this must resolve to first MIDDLEWARE entry
+            0, 
+            "django_hosts.middleware.HostsRequestMiddleware"
+        )
+
+        MIDDLEWARE.append(  # this must resolve last MIDDLEWARE entry
+            "django_hosts.middleware.HostsResponseMiddleware"
+        )  
         ```
 
-    5. Add the following line *after* `MIDDLEWARE`:
-        ```
-        MIDDLEWARE.append('django_hosts.middleware.HostsResponseMiddleware')  # this _must_ be last MIDDLEWARE entry
-        ```
-
-    6. Add the following line *after* `ARCHES_APPLICATIONS`:
+    5. Add the following line *after* `ARCHES_APPLICATIONS`:
         ```
         INSTALLED_APPS += ARCHES_APPLICATIONS
         ```
     
-    7. If there are any duplicated entries between `ARCHES_APPLICATIONS` and `INSTALLED_APPS`, remove the entry from `INSTALLED_APPS`.
+    6. If there are any duplicated entries between `ARCHES_APPLICATIONS` and `INSTALLED_APPS`, remove the entry from `INSTALLED_APPS`.
 
-    8. Update `WEBPACK_LOADER` to the following:
+    7. Update `WEBPACK_LOADER` to the following:
         ```
         WEBPACK_LOADER = {
             "DEFAULT": {
                 "STATS_FILE": os.path.join(APP_ROOT, '..', 'webpack/webpack-stats.json'),
             },
         }
         ```
-    3. Update `LOCALE_PATHS.append(...)` to `LOCALE_PATHS.insert(0, ...)`
+    8. Update `LOCALE_PATHS.append(...)` to `LOCALE_PATHS.insert(0, ...)`
         ```
         LOCALE_PATHS.insert(0, os.path.join(APP_ROOT, 'locale'))
         ```
-    4. Add `"json"` to `FILE_TYPES` if you wish to use the JSON-LD bulk import module.
+    9. Add `"json"` to `FILE_TYPES` if you wish to use the JSON-LD bulk import module.
 
 11. Update urls.py:
     ```
     from django.conf import settings
     from django.conf.urls.static import static
     from django.conf.urls.i18n import i18n_patterns
     from django.urls import include, path
-    ...  # other project-level imports
 
     urlpatterns = [
-        ...  # other project-level routes
-        path('', include('arches.urls')),  # ensure project and Arches-application urls go _above_ this entry
-    ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+        # project-level urls
+    ]
+
+    # Ensure Arches core urls are superceded by project-level urls
+    urlpatterns.append(path('', include('arches.urls')))
+
+    # Adds URL pattern to serve media files during development
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
     # Only handle i18n routing in active project. This will still handle the routes provided by Arches core and Arches applications,
     # but handling i18n routes in multiple places causes application errors.
@@ -371,7 +377,6 @@ Minor incompatibilities:
             urlpatterns = i18n_patterns(*urlpatterns)
 
         urlpatterns.append(path("i18n/", include("django.conf.urls.i18n")))
-        
     ```
 
 12. Run `python manage.py updateproject`