Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ marshmallow
freezegun
snakeviz
django-browser-reload
ruff
ruff>=0.15
19 changes: 12 additions & 7 deletions src/core/logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1035,22 +1035,27 @@ def password_policy_check(request):
password = request.POST.get("password_1")

rules = [
lambda s: len(password) >= request.press.password_length
or _("Your password must be {} characters long").format(
request.press.password_length
lambda s: (
len(password) >= request.press.password_length
or _("Your password must be {} characters long").format(
request.press.password_length
)
)
]

if request.press.password_upper:
rules.append(
lambda password: any(x.isupper() for x in password)
or _("An uppercase character is required")
lambda password: (
any(x.isupper() for x in password)
or _("An uppercase character is required")
)
)

if request.press.password_number:
rules.append(
lambda password: any(x.isdigit() for x in password)
or _("A number is required")
lambda password: (
any(x.isdigit() for x in password) or _("A number is required")
)
)

problems = [p for p in [r(password) for r in rules] if p != True]
Expand Down
4 changes: 2 additions & 2 deletions src/review/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def __init__(self, *args, **kwargs):
self.fields["decision"].widget.attrs["onchange"] = "decision_change()"
self.fields["decision"].widget.attrs["onfocus"] = "store_previous_decision()"
self.fields["editor"].queryset = editors
self.fields["editor"].label_from_instance = (
lambda obj: f"{obj.full_name()} ({obj.email})"
self.fields["editor"].label_from_instance = lambda obj: (
f"{obj.full_name()} ({obj.email})"
)
if not newly_created:
self.fields["message_to_editor"].widget = forms.HiddenInput()
Expand Down
4 changes: 2 additions & 2 deletions src/submission/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ class EditorArticleInfoSubmit(ArticleInfo):
def __init__(self, *args, **kwargs):
super(EditorArticleInfoSubmit, self).__init__(*args, **kwargs)
if self.fields.get("section"):
self.fields["section"].label_from_instance = (
lambda obj: obj.display_name_public_submission
self.fields["section"].label_from_instance = lambda obj: (
obj.display_name_public_submission
)
self.fields["section"].help_text = (
"As an editor you will see all "
Expand Down