Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 55 Pull Requests Actions 1 Packages Projects Wiki Activity

Merge pull request 'user merging should only be done by admins' (#1183) from user-upd into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 20m19s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Successful in 9m49s
Details

Browse Source 
Reviewed-on: #1183
This commit was merged in pull request #1183.
This commit is contained in:
philipp
2026-01-08 20:23:22 +01:00
parent 13de487b10 2ed22d6440
commit 6d36d01c2f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tera/admin/user.rs
View File

@@ -64,6 +64,7 @@ async fn index(
let user: User = user.into_inner(); let user: User = user.into_inner();
let allowed_to_edit = ManageUserUser::new(db, &user).await.is_some(); let allowed_to_edit = ManageUserUser::new(db, &user).await.is_some();
let is_admin = AdminUser::new(db, &user).await.is_some();
let users: Vec<UserWithRolesAndMembershipPdf> = join_all(user_futures).await; let users: Vec<UserWithRolesAndMembershipPdf> = join_all(user_futures).await;
let financial = Role::all_cluster(db, "financial").await; let financial = Role::all_cluster(db, "financial").await;
@@ -76,6 +77,7 @@ async fn index(
context.insert("flash", &msg.into_inner()); context.insert("flash", &msg.into_inner());
} }
context.insert("allowed_to_edit", &allowed_to_edit); context.insert("allowed_to_edit", &allowed_to_edit);
context.insert("is_admin", &is_admin);
context.insert("users", &users); context.insert("users", &users);
context.insert("roles", &roles); context.insert("roles", &roles);
context.insert("financial", &financial); context.insert("financial", &financial);
@@ -110,6 +112,7 @@ async fn index_admin(
context.insert("flash", &msg.into_inner()); context.insert("flash", &msg.into_inner());
} }
context.insert("allowed_to_edit", &allowed_to_edit); context.insert("allowed_to_edit", &allowed_to_edit);
context.insert("is_admin", &true);
context.insert("users", &users); context.insert("users", &users);
context.insert("roles", &roles); context.insert("roles", &roles);
context.insert("financial", &financial); context.insert("financial", &financial);

8
templates/admin/user/index.html.tera
View File

@@ -4,9 +4,11 @@
<div class="max-w-screen-lg w-full"> <div class="max-w-screen-lg w-full">
<h1 class="h1">Users</h1> <h1 class="h1">Users</h1>
{% if allowed_to_edit %} {% if allowed_to_edit %}
<div class="mt-5 flex gap-3"> {% if is_admin %}
<a href="/admin/user/merge" class="btn btn-dark">Benutzer zusammenführen</a> <div class="mt-5 flex gap-3">
</div> <a href="/admin/user/merge" class="btn btn-dark">Benutzer zusammenführen</a>
</div>
{% endif %}
<details class="mt-5 bg-gray-200 dark:bg-primary-600 p-3 rounded-md"> <details class="mt-5 bg-gray-200 dark:bg-primary-600 p-3 rounded-md">
<summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white"> <summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white">
Neue Person hinzufügen Neue Person hinzufügen