Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/user-delete' into 'dev'

Browse Source 
Fix users not being able to be deleted.

See merge request crafty-controller/crafty-4!661
This commit is contained in:
Iain Powrie 2023-11-01 01:12:39 +00:00
commit 3cd19b113b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ TBD
### Bug fixes
- Fix logic issue with `get_files` API permissions check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/654))
- Fix notifications not showing up/being reset #298 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/660))
- Fix users not being able to be deleted since the prompt fails to display ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/661))
### Tweaks
- Auto refresh Crafty Announcements on 30m interval ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/653))
- Improve Crafty toggle buttons and Webhooks page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/656))

3
app/frontend/templates/panel/panel_edit_user.html
View File

@ -363,6 +363,7 @@ data['lang']) }}{% end %}
{% block js %}
<script>
const userId = new URLSearchParams(document.location.search).get('id');
function submit_user(event) {
if (!validateForm()) {
event.preventDefault();
@ -399,8 +400,6 @@ data['lang']) }}{% end %}
}
}
$("#user_form").on("submit", async function (e) {
const userId = new URLSearchParams(document.location.search).get('id');
console.log(userId)
e.preventDefault();
let password = null;
if(!userId){