diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index a221d88fa..39917ad42 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -290,7 +290,7 @@ CSP_DEFAULT_SRC = allowed_sources # Most things fall back to default-src, but these two do not and should be # explicitly set CSP_FRAME_ANCESTORS = allowed_sources -CSP_FORM_ACTION = ("'self'", "https://idp.int.identitysandbox.gov/openid_connect/logout") +CSP_FORM_ACTION = allowed_sources # Content-Length header is set by django.middleware.common.CommonMiddleware diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index ad3883f4f..67ab630e1 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -46,9 +46,9 @@ for step, view in [ urlpatterns = [ path("", views.index, name="home"), path( - "admin/logout/", - RedirectView.as_view(pattern_name="logout", permanent=False), - ), + "admin/logout/", + RedirectView.as_view(pattern_name="logout", permanent=False), + ), path("admin/", admin.site.urls), path( "application//edit/", @@ -118,7 +118,9 @@ urlpatterns = [ ), ] - +# What is the purpose of this? +# This behaviour gets overwritten, so this doesn't do anything... +# Login in particular if not settings.DEBUG: urlpatterns += [ # redirect to login.gov diff --git a/src/registrar/templates/admin/base_site.html b/src/registrar/templates/admin/base_site.html index 9be44e43f..72bd7af21 100644 --- a/src/registrar/templates/admin/base_site.html +++ b/src/registrar/templates/admin/base_site.html @@ -13,5 +13,20 @@ {% include "admin/color_theme_toggle.html" %} {% endif %} {% endblock %} - +{% block userlinks %} + {% if site_url %} + View site / + {% endif %} + {% if user.is_active and user.is_staff %} + {% url 'django-admindocs-docroot' as docsroot %} + {% if docsroot %} + Documentation / + {% endif %} + {% endif %} + {% if user.has_usable_password %} + Change password / + {% endif %} + Log out + {% include "admin/color_theme_toggle.html" %} + {% endblock %} {% block nav-global %}{% endblock %} \ No newline at end of file