#8754 fix user edit form success/error message cleanup issue (#8764)

* #8754 fix issue with default user role on create, profile navigation issue * #8754 fix user edit form success/error message cleanup issue
TiddlyWiki · Nov 20, 2024 · a697a66 · a697a66
1 parent 9f48e75
commit a697a66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
@@ -23,7 +23,7 @@ exports.handler = function(request,response,state) {
 	// Clean up any existing error/success messages if the user_id is different from the "$:/temp/mws/user-info/preview-user-id"
 	var lastPreviewedUser = $tw.wiki.getTiddlerText("$:/temp/mws/user-info/" + user_id + "/preview-user-id");
 
-	if(user_id !== lastPreviewedUser) {
+	if(user_id !== lastPreviewedUser || request.url.includes("preview")) {
 		$tw.mws.store.adminWiki.deleteTiddler("$:/temp/mws/change-password/" + user_id + "/	error");
 		$tw.mws.store.adminWiki.deleteTiddler("$:/temp/mws/change-password/" + user_id + "/success");
 		$tw.mws.store.adminWiki.deleteTiddler("$:/temp/mws/login/error");

diff --git a/plugins/tiddlywiki/multiwikiserver/templates/get-users.tid b/plugins/tiddlywiki/multiwikiserver/templates/get-users.tid
@@ -23,7 +23,7 @@ title: $:/plugins/tiddlywiki/multiwikiserver/templates/get-users
 			<$list filter="[<user-list>jsonindexes[]]" variable="user-index">
 				<$let currentUser={{{ [<user-list>jsonextract<user-index>] }}}>
 					<$set name="user-id" value={{{ [<currentUser>jsonget[user_id]] }}}>
-						<a href={{{ [[/admin/users/]addsuffix<user-id>] }}} class="user-item">
+						<a href={{{ [[/admin/users/]addsuffix<user-id>addsuffix[?q=preview]] }}} class="user-item">
 							<div class="user-info">
 								<span class="user-name">
 									<$text text={{{ [<currentUser>jsonget[username]] }}}/>