Skip to content

Commit 9c234ff

Browse files
authored
fix: broken actions tab of form admin (#29)
* fix: broken Actions tab of form admin * Update djangocms_form_builder/settings.py * Fix sourcery recommendation * Update codecov.yml
1 parent 19c39e7 commit 9c234ff

File tree

10 files changed

+401
-214
lines changed

10 files changed

+401
-214
lines changed

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
dj51_cms41.txt,
2121
]
2222
os: [
23-
ubuntu-20.04,
23+
ubuntu-latest,
2424
]
2525
exclude:
2626
- python-version: 3.9

djangocms_form_builder/actions.py

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,10 @@ def get_action_class(action):
5858

5959
class ActionMixin:
6060
"""Adds action form elements to Form plugin admin"""
61+
6162
def get_form(self, request, *args, **kwargs):
6263
"""Creates new form class based adding the actions as mixins"""
63-
return type(
64-
"FormActionAdminForm",
65-
(self.form, *_action_registry.values()),
66-
{}
67-
)
64+
return type("FormActionAdminForm", (self.form, *_action_registry.values()), {})
6865

6966
def get_fieldsets(self, request, obj=None):
7067
fieldsets = super().get_fieldsets(request, obj)
@@ -78,7 +75,7 @@ def get_fieldsets(self, request, obj=None):
7875
block=None,
7976
position=-1,
8077
blockname=action.verbose_name,
81-
blockattrs=dict(classes=(hash, 'action-hide')),
78+
blockattrs=dict(classes=(f"c{hash}", "action-hide")),
8279
)
8380
return fieldsets
8481

@@ -120,7 +117,7 @@ def execute(self, form, request):
120117
keys = {}
121118
defaults = {
122119
"form_name": get_option(form, "form_name"),
123-
"form_user": None if request.user.is_anonymous else request.user
120+
"form_user": None if request.user.is_anonymous else request.user,
124121
}
125122
defaults.update(
126123
{
@@ -147,7 +144,9 @@ def execute(self, form, request):
147144
def validate_recipients(value):
148145
recipients = value.split()
149146
for recipient in recipients:
150-
EmailValidator(message=_("Please replace \"%s\" by a valid email address.") % recipient)(recipient)
147+
EmailValidator(
148+
message=_('Please replace "%s" by a valid email address.') % recipient
149+
)(recipient)
151150

152151

153152
@register
@@ -193,17 +192,25 @@ def execute(self, form, request):
193192
cleaned_data=form.cleaned_data,
194193
form_name=getattr(form.Meta, "verbose_name", ""),
195194
user=request.user,
196-
user_agent=request.headers["User-Agent"] if "User-Agent" in request.headers else "",
195+
user_agent=request.headers["User-Agent"]
196+
if "User-Agent" in request.headers
197+
else "",
197198
referer=request.headers["Referer"] if "Referer" in request.headers else "",
198199
)
199200

200-
html_message = render_to_string(f"djangocms_form_builder/mails/{template_set}/mail_html.html", context)
201+
html_message = render_to_string(
202+
f"djangocms_form_builder/mails/{template_set}/mail_html.html", context
203+
)
201204
try:
202-
message = render_to_string(f"djangocms_form_builder/mails/{template_set}/mail.txt", context)
205+
message = render_to_string(
206+
f"djangocms_form_builder/mails/{template_set}/mail.txt", context
207+
)
203208
except TemplateDoesNotExist:
204209
message = strip_tags(html_message)
205210
try:
206-
subject = render_to_string(f"djangocms_form_builder/mails/{template_set}/subject.txt", context)
211+
subject = render_to_string(
212+
f"djangocms_form_builder/mails/{template_set}/subject.txt", context
213+
)
207214
except TemplateDoesNotExist:
208215
subject = self.subject % dict(form_name=context["form_name"])
209216

@@ -248,7 +255,9 @@ def execute(self, form, request):
248255
message = self.get_parameter(form, "submitmessage_message")
249256
# Overwrite the success context and render template
250257
form.get_success_context = lambda *args, **kwargs: {"message": message}
251-
form.Meta.options["render_success"] = "djangocms_form_builder/actions/submit_message.html"
258+
form.Meta.options["render_success"] = (
259+
"djangocms_form_builder/actions/submit_message.html"
260+
)
252261
# Overwrite the default redirect to same page
253262
if form.Meta.options.get("redirect") == SAME_PAGE_REDIRECT:
254263
form.Meta.options["redirect"] = None
@@ -275,4 +284,6 @@ class Meta:
275284
)
276285

277286
def execute(self, form, request):
278-
form.Meta.options["redirect"] = get_link(self.get_parameter(form, "redirect_link"))
287+
form.Meta.options["redirect"] = get_link(
288+
self.get_parameter(form, "redirect_link")
289+
)

djangocms_form_builder/cms_plugins/legacy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from cms.plugin_pool import plugin_pool
22
from django.conf import settings
33

4-
if 'djangocms_frontend.contrib.frontend_forms' in settings.INSTALLED_APPS:
4+
if "djangocms_frontend.contrib.frontend_forms" in settings.INSTALLED_APPS:
55
from djangocms_frontend.contrib.frontend_forms.cms_plugins import (
66
BooleanFieldPlugin,
77
CharFieldPlugin,

0 commit comments

Comments
 (0)