mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-02-28 00:40:01 +00:00
Code Issues Releases Wiki Activity

Fix issue with default user role on create, profile navigation issue (#8761)

Browse Source
This commit is contained in:
webplusai 2024-11-19 12:43:07 +01:00 committed by GitHub
parent d9256707f4
commit 4dc2486d4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
View File

@ -45,6 +45,7 @@ exports.handler = function(request,response,state) {
"user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no", "user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no",
"first-guest-user": state.firstGuestUser ? "yes" : "no", "first-guest-user": state.firstGuestUser ? "yes" : "no",
"show-annon-config": state.showAnonConfig ? "yes" : "no", "show-annon-config": state.showAnonConfig ? "yes" : "no",
"user": JSON.stringify(state.authenticatedUser),
}}); }});
response.write(html); response.write(html);
response.end(); response.end();

1
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
View File

@ -86,6 +86,7 @@ exports.handler = function(request,response,state) {
"user-initials": user.username.split(" ").map(name => name[0]).join(""), "user-initials": user.username.split(" ").map(name => name[0]).join(""),
"user-role": JSON.stringify(userRole), "user-role": JSON.stringify(userRole),
"all-roles": JSON.stringify(allRoles), "all-roles": JSON.stringify(allRoles),
"first-guest-user": state.firstGuestUser ? "yes" : "no",
"is-current-user-profile": state.authenticatedUser && state.authenticatedUser.user_id === $tw.utils.parseInt(user_id, 10) ? "yes" : "no", "is-current-user-profile": state.authenticatedUser && state.authenticatedUser.user_id === $tw.utils.parseInt(user_id, 10) ? "yes" : "no",
"username": state.authenticatedUser ? state.authenticatedUser.username : state.firstGuestUser ? "Annonymous User" : "Guest", "username": state.authenticatedUser ? state.authenticatedUser.username : state.firstGuestUser ? "Annonymous User" : "Guest",
"user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no", "user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no",

6
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
View File

@ -78,6 +78,12 @@ exports.handler = function(request, response, state) {
response.end(); response.end();
return; return;
} else { } else {
// assign role to user
const roles = sqlTiddlerDatabase.listRoles();
const roleId = roles.find(role => role.role_name.toUpperCase() !== "ADMIN")?.role_id;
if (roleId) {
sqlTiddlerDatabase.addRoleToUser(userId, roleId);
}
response.writeHead(302, {"Location": "/admin/users/"+userId}); response.writeHead(302, {"Location": "/admin/users/"+userId});
response.end(); response.end();
} }

33
plugins/tiddlywiki/multiwikiserver/templates/mws-header.tid
View File

@ -1,7 +1,13 @@
title: $:/plugins/tiddlywiki/multiwikiserver/templates/mws-header title: $:/plugins/tiddlywiki/multiwikiserver/templates/mws-header
<div class="mws-header"> <div class="mws-header">
<h1><$text text=<<page-title>>/></h1> <h1>
<a href="/">
<span class="mws-logo">🏠</span>
</a>
<span class="divider">|</span>
<$text text=<<page-title>>/>
</h1>
<div class="mws-user-info"> <div class="mws-user-info">
<span>Hello, <$text text=<<username>>/></span> <span>Hello, <$text text=<<username>>/></span>
<% if [<user-is-admin>match[yes]] %> <% if [<user-is-admin>match[yes]] %>
@ -16,9 +22,11 @@ title: $:/plugins/tiddlywiki/multiwikiserver/templates/mws-header
</div> </div>
</div> </div>
<% elseif [<username>!match[Guest]]+[<first-guest-user>match[no]] %> <% elseif [<username>!match[Guest]]+[<first-guest-user>match[no]] %>
<a href={{{ [<user>jsonget[user_id]addprefix[/admin/users/]] }}}> <$set name="userId" value={{{ [<user>jsonget[user_id]] }}}>
<button class="mws-profile-btn">Profile</button> <a href={{{ [<userId>addprefix[/admin/users/]] }}}>
</a> <button class="mws-profile-btn">Profile</button>
</a>
</$set>
<% endif %> <% endif %>
<form action="/logout" method="post" class="mws-logout-form"> <form action="/logout" method="post" class="mws-logout-form">
<input type="submit" value="Logout" class="mws-logout-button"/> <input type="submit" value="Logout" class="mws-logout-button"/>
@ -36,6 +44,17 @@ title: $:/plugins/tiddlywiki/multiwikiserver/templates/mws-header
margin-bottom: 20px; margin-bottom: 20px;
} }
.mws-header h1 {
display: flex;
align-items: center;
gap: 10px;
}
.mws-header h1 .divider {
font-size: 16px;
color: #ccc;
}
.mws-user-info { .mws-user-info {
display: flex; display: flex;
align-items: center; align-items: center;
@ -126,4 +145,8 @@ title: $:/plugins/tiddlywiki/multiwikiserver/templates/mws-header
.mws-admin-form-button:hover { .mws-admin-form-button:hover {
background-color: #ddd; background-color: #ddd;
} }
</style>
.mws-logo {
font-size: 24px;
}
</style>