From 394cf0d2aac09ead067d47cab910419aca8b3dae Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Wed, 4 Oct 2023 15:45:11 -0500 Subject: [PATCH 1/2] Bump django-cms to 3.8 and fix admin UI --- poetry.lock | 23 +++++++++++------------ pyproject.toml | 3 ++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/poetry.lock b/poetry.lock index 54ce95234..976cf5aac 100644 --- a/poetry.lock +++ b/poetry.lock @@ -814,24 +814,23 @@ django = ">=2.2" [[package]] name = "django-cms" -version = "3.7.4" -description = "An Advanced Django CMS" +version = "3.8.2" +description = "Lean enterprise content management powered by Django." category = "main" optional = false python-versions = "*" files = [ - {file = "django-cms-3.7.4.tar.gz", hash = "sha256:9374af5a35bac590f1891031fb0878a0e6c2dc5309a6907929c6a036493694f6"}, - {file = "django_cms-3.7.4-py2.py3-none-any.whl", hash = "sha256:9302f0e21153fc9afca55d9c3424ca3654b51d274a1af6ec39f4fbb05059fe46"}, + {file = "django-cms-3.8.2.tar.gz", hash = "sha256:b32a979a3ce9516a907cd9b481a3291f158e797c2b92c157561bcff2c43f36ae"}, + {file = "django_cms-3.8.2-py2.py3-none-any.whl", hash = "sha256:af80688c5e1a2a1151f122746482d7a40a43c2537c91220347e4272b1a5a627d"}, ] [package.dependencies] -Django = ">=1.11,<4" +Django = ">=2.2" django-classy-tags = ">=0.7.2" django-formtools = ">=2.1" django-sekizai = ">=0.7" -django-treebeard = ">=4.3" +django-treebeard = ">=4.3,<4.5" djangocms-admin-style = ">=1.2" -six = "*" [[package]] name = "django-filer" @@ -1069,14 +1068,14 @@ wsaccel = ["wsaccel (>=0.6.2)"] [[package]] name = "djangocms-admin-style" -version = "3.2.5" +version = "2.0.0" description = "Adds pretty CSS styles for the django CMS admin interface." category = "main" optional = false -python-versions = ">=3.7" +python-versions = "*" files = [ - {file = "djangocms-admin-style-3.2.5.tar.gz", hash = "sha256:abbe89d369c0779f7e5f839887a77bdb21660b547e83605d6a4a6df958ace7a5"}, - {file = "djangocms_admin_style-3.2.5-py3-none-any.whl", hash = "sha256:fc51677f12dbec6996590c430c90c9fe8efa32ceadfee383a576ed092be07526"}, + {file = "djangocms-admin-style-2.0.0.tar.gz", hash = "sha256:080f55fe2b643cf608ee8feeb1407bf20e1e76c0f2c058a1bf360b4aa0c90cf4"}, + {file = "djangocms_admin_style-2.0.0-py3-none-any.whl", hash = "sha256:78c64b4e2adba59a7c2e4d5b34e68dc32ab3e2d677f8a94403a2ae9d211aa212"}, ] [[package]] @@ -3529,4 +3528,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.7.12" -content-hash = "92b39fa1042f98ce79752aad3d0abf7e62da11410e515c524b3a46caa86ff774" +content-hash = "9cfa2e07d0ceb7e4c250783d7365ef9ac541471222fd053b36bfebbcf1c3b804" diff --git a/pyproject.toml b/pyproject.toml index 64306fbc3..96995f82c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ python = "^3.7.12" agavepy = "1.0.0a12" Django = "^2.2.28" cryptography = "^2.3.1" -django-cms = "3.7.4" +django-cms = "3.8.2" importlib-resources = "^5.4.0" django-filer = "^1.7.1" django-formtools = "2.2" @@ -66,6 +66,7 @@ opf-fido = "1.4.1" asgiref = "^3.6.0" importlib-metadata = "2.1.3" django-select2 = "6.3.1" +djangocms-admin-style = "2.0.0" [build-system] requires = ["poetry-core>=1.0.0"] From 209eeac6125d22645a4cdc93a0e222eabcb0be83 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Thu, 5 Oct 2023 09:40:49 -0500 Subject: [PATCH 2/2] Fix form export and admin login page --- designsafe/settings/common_settings.py | 8 +++++++- designsafe/urls.py | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py index 583048f10..4d293e61f 100644 --- a/designsafe/settings/common_settings.py +++ b/designsafe/settings/common_settings.py @@ -16,6 +16,7 @@ import json from django.urls import reverse_lazy from django.utils.text import format_lazy +from django.utils.translation import gettext_lazy as _ gettext = lambda s: s @@ -337,7 +338,12 @@ DJANGOCMS_FORMS_TEMPLATES = ( ('djangocms_forms/form_template/default.html', 'Default'), ) -DJANGOCMS_FORMS_FORMAT_CHOICES = () +DJANGOCMS_FORMS_FORMAT_CHOICES = ( + ("csv", _("CSV")), + ("json", _("JSON")), + ("yaml", _("YAML")), + ("xlsx", _("Microsoft Excel")), +) DJANGOCMS_FORMS_USE_HTML5_REQUIRED = False DJANGOCMS_FORMS_WIDGET_CSS_CLASSES = { 'text': ('form-control', ), diff --git a/designsafe/urls.py b/designsafe/urls.py index 47fdba676..a6cf7f1dd 100644 --- a/designsafe/urls.py +++ b/designsafe/urls.py @@ -29,6 +29,7 @@ from django.views.generic import RedirectView, TemplateView from django.urls import reverse from django.http import HttpResponse, HttpResponseRedirect +from django.shortcuts import redirect from designsafe.apps.auth.views import login_options as des_login_options from django.contrib.auth.views import LogoutView as des_logout from designsafe.views import project_version as des_version, redirect_old_nees @@ -49,6 +50,7 @@ urlpatterns = [ # admin + url(r'^admin/login/', lambda _: redirect("/login/?next=/admin/")), url(r'^admin/', admin.site.urls), url(r'^admin/impersonate/', include('impersonate.urls')),