mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-11-03 17:13:05 +00:00
Code Issues Releases Wiki Activity

#8776 resolve server crash on delete role in use (#8796)

Browse Source
This commit is contained in:
webplusai
2024-12-05 13:29:58 +01:00
committed by GitHub
parent ac59af19dd
commit d7eb39c88e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js
View File

@@ -38,15 +38,14 @@ POST /admin/delete-role
return; return;
} }
// Delete the role
sqlTiddlerDatabase.deleteRole(role_id);
// Check if the role is in use // Check if the role is in use
var isRoleInUse = sqlTiddlerDatabase.isRoleInUse(role_id); var isRoleInUse = sqlTiddlerDatabase.isRoleInUse(role_id);
if(isRoleInUse) { if(isRoleInUse) {
sqlTiddlerDatabase.deleteUserRolesByRoleId(role_id); sqlTiddlerDatabase.deleteUserRolesByRoleId(role_id);
} }
// Delete the role
sqlTiddlerDatabase.deleteRole(role_id);
// Redirect back to the roles management page // Redirect back to the roles management page
response.writeHead(302, { "Location": "/admin/roles" }); response.writeHead(302, { "Location": "/admin/roles" });
response.end(); response.end();

2
plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
View File

@@ -1156,7 +1156,7 @@ SqlTiddlerDatabase.prototype.deleteRole = function(roleId) {
SqlTiddlerDatabase.prototype.listRoles = function() { SqlTiddlerDatabase.prototype.listRoles = function() {
return this.engine.runStatementGetAll(` return this.engine.runStatementGetAll(`
SELECT * FROM roles ORDER BY role_name SELECT * FROM roles ORDER BY role_name DESC
`); `);
}; };