Skip to content

Commit

Permalink
Merge branch 'release/5.14.1' into 'master'
Browse files Browse the repository at this point in the history
Merge release 5.14.1 into master

See merge request os2borgerpc/os2borgerpc-admin-site!426
  • Loading branch information
Andreas Poulsen committed May 8, 2023
2 parents d78aaf8 + 762fc7b commit 39751c2
Show file tree
Hide file tree
Showing 4 changed files with 231 additions and 45 deletions.
5 changes: 5 additions & 0 deletions NEWS.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 5.14.1, May 8, 2023
---------------------------

- Fix bug causing MandatoryParameterMissingError when saving a group with an associated script that uses password input

Version 5.14.0, May 3, 2023
---------------------------

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.14.0
5.14.1
4 changes: 3 additions & 1 deletion admin_site/system/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,9 @@ def update_policy_from_request(self, request, submit_name):
else:
par.file_value = req_files[param_name]
else:
if param_name not in req_params:
if param_name not in req_params or (
not req_params[param_name] and inp.value_type == Input.PASSWORD
):
if par.pk is not None:
# Don't blank existing values
continue
Expand Down
Loading

0 comments on commit 39751c2

Please sign in to comment.