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

user-role-cluster #760

Merged
philipp merged 10 commits from user-role-cluster into staging 2024-10-11 11:20:59 +02:00
Conversation 0 Commits 10 Files Changed 10 +5 -20
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9881627186 - Show all commits

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

@ -293,8 +293,6 @@ async fn update(
data: Form<UserEditForm<'_>>, data: Form<UserEditForm<'_>>,
admin: ManageUserUser, admin: ManageUserUser,
) -> Flash<Redirect> { ) -> Flash<Redirect> {
println!("{data:#?}");
let user = User::find_by_id(db, data.id).await; let user = User::find_by_id(db, data.id).await;
Log::create( Log::create(
db, db,

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

@ -79,25 +79,12 @@
<div class="w-full grid gap-3 mt-3"> <div class="w-full grid gap-3 mt-3">
<input type="hidden" name="id" value="{{ user.id }}" /> <input type="hidden" name="id" value="{{ user.id }}" />
<div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3"> <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
{% for cluster, r in roles | group_by(attribute="cluster") %} {# for cluster, r in roles | group_by(attribute="cluster") #}
{{ cluster }} {# cluster #}
<label for="{{ cluster }}" class="flex items-center cursor-pointer text-black dark:text-white hover:text-gray-900 dark:hover:text-gray-100">
<select id="{{ cluster }}" name="{{ cluster }}" class="h-8 accent-primary-600 dark:accent-primary-200 mr-2">
<option value="">None</option>
{% for role in r %}
<option value="{{ role.id }}">{{ role.name }}</option>
{% endfor %}
</select>
</label>
{% endfor %}
{% for role in roles %} {% for role in roles %}
{% if not role.cluster %}
{{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }} {{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }}
{% endif %}
{% endfor %} {% endfor %}
{# endfor #}
<hr class="sm:col-span-2 lg:col-span-4 my-3" /> <hr class="sm:col-span-2 lg:col-span-4 my-3" />
{% if user.membership_pdf %} {% if user.membership_pdf %}
<a href="/admin/user/{{ user.id }}/membership" <a href="/admin/user/{{ user.id }}/membership"