Refactor user group management by moving auth groups to profile.html and creating a dedicated auth_groups_fragment.html for better organization and clarity
This commit is contained in:
Ross
@@ -0,0 +1,46 @@
|
|||||||
|
{% comment %}Auth groups fragment for HTMX replacement{% endcomment %}
|
||||||
|
<div id="auth-groups-{{ user.pk }}" class="mt-1 d-flex flex-wrap gap-2 align-items-center">
|
||||||
|
{% if user.groups.all %}
|
||||||
|
{% for perm_group in user.groups.all %}
|
||||||
|
{% if request.user.is_superuser or is_cid_user_manager %}
|
||||||
|
<button
|
||||||
|
class="btn btn-sm btn-info text-dark"
|
||||||
|
hx-post="{% url 'generic:user_toggle_group' user.pk perm_group.pk %}?type=auth"
|
||||||
|
hx-target="#auth-groups-{{ user.pk }}"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
>
|
||||||
|
{{ perm_group.name }}
|
||||||
|
<span class="ms-1 text-muted small">×</span>
|
||||||
|
</button>
|
||||||
|
{% else %}
|
||||||
|
<span class="badge bg-info text-dark me-1">{{ perm_group.name }}</span>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<span class="badge bg-light text-muted">No permission groups</span>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if request.user.is_superuser or is_cid_user_manager %}
|
||||||
|
{% if available_auth_groups.count %}
|
||||||
|
<div class="dropdown">
|
||||||
|
<button class="btn btn-sm btn-outline-primary dropdown-toggle" type="button" id="addAuthGroupDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
|
Add
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu" aria-labelledby="addAuthGroupDropdown">
|
||||||
|
{% for ag in available_auth_groups %}
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
class="dropdown-item"
|
||||||
|
hx-post="{% url 'generic:user_toggle_group' user.pk ag.pk %}?type=auth"
|
||||||
|
hx-target="#auth-groups-{{ user.pk }}"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
>
|
||||||
|
{{ ag.name }}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
@@ -50,53 +50,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
{# Auth groups moved to the Permission groups area in profile.html #}
|
||||||
<small class="text-muted">Auth groups:</small>
|
|
||||||
<div class="d-flex flex-wrap gap-2 mt-1">
|
|
||||||
{% if user.groups.all %}
|
|
||||||
{% for group in user.groups.all %}
|
|
||||||
{% if request.user.is_superuser or is_cid_user_manager %}
|
|
||||||
<button
|
|
||||||
class="btn btn-sm btn-outline-secondary"
|
|
||||||
hx-post="{% url 'generic:user_toggle_group' user.pk group.pk %}?type=auth"
|
|
||||||
hx-target="#user-groups-{{ user.pk }}"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
{{ group.name }}
|
|
||||||
<span class="ms-1 text-muted small">×</span>
|
|
||||||
</button>
|
|
||||||
{% else %}
|
|
||||||
<span class="btn btn-sm btn-outline-secondary">{{ group.name }}</span>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% else %}
|
|
||||||
<span class="badge bg-light text-muted">No auth groups</span>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if request.user.is_superuser or is_cid_user_manager %}
|
|
||||||
{% if available_auth_groups.count %}
|
|
||||||
<div class="dropdown">
|
|
||||||
<button class="btn btn-sm btn-outline-primary dropdown-toggle" type="button" id="addAuthGroupDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
|
||||||
Add auth group
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu" aria-labelledby="addAuthGroupDropdown">
|
|
||||||
{% for ag in available_auth_groups %}
|
|
||||||
<li>
|
|
||||||
<button
|
|
||||||
class="dropdown-item"
|
|
||||||
hx-post="{% url 'generic:user_toggle_group' user.pk ag.pk %}?type=auth"
|
|
||||||
hx-target="#user-groups-{{ user.pk }}"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
{{ ag.name }}
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3926,6 +3926,17 @@ def user_toggle_group(request, user_id, group_id):
|
|||||||
|
|
||||||
is_cid_user_manager = request.user.groups.filter(name="cid_user_manager").exists()
|
is_cid_user_manager = request.user.groups.filter(name="cid_user_manager").exists()
|
||||||
|
|
||||||
|
if gtype == "auth":
|
||||||
|
return render(
|
||||||
|
request,
|
||||||
|
"generic/partials/auth_groups_fragment.html",
|
||||||
|
{
|
||||||
|
"user": user,
|
||||||
|
"available_auth_groups": available_auth_groups,
|
||||||
|
"is_cid_user_manager": is_cid_user_manager,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
"generic/partials/user_groups_fragment.html",
|
"generic/partials/user_groups_fragment.html",
|
||||||
|
|||||||
+45
-9
@@ -13,18 +13,54 @@
|
|||||||
<h4 class="card-title mb-1">{{ user.get_full_name|default:user.username }}</h4>
|
<h4 class="card-title mb-1">{{ user.get_full_name|default:user.username }}</h4>
|
||||||
<p class="text-muted mb-1">@{{ user.username }}</p>
|
<p class="text-muted mb-1">@{{ user.username }}</p>
|
||||||
<p class="mb-0"><a href="mailto:{{ user.email }}">{{ user.email }}</a></p>
|
<p class="mb-0"><a href="mailto:{{ user.email }}">{{ user.email }}</a></p>
|
||||||
{% if user.groups.all %}
|
<div class="mt-2">
|
||||||
<div class="mt-2">
|
<small class="text-muted">Permission groups:</small>
|
||||||
<small class="text-muted">Permission groups:</small>
|
<div id="auth-groups-{{ user.pk }}" class="mt-1 d-flex flex-wrap gap-2 align-items-center">
|
||||||
<div class="mt-1">
|
{% if user.groups.all %}
|
||||||
{% for perm_group in user.groups.all %}
|
{% for perm_group in user.groups.all %}
|
||||||
<span class="badge bg-info text-dark me-1">{{ perm_group.name }}</span>
|
{% if request.user.is_superuser or is_cid_user_manager %}
|
||||||
{% empty %}
|
<button
|
||||||
<span class="text-muted small">None</span>
|
class="btn btn-sm btn-info text-dark"
|
||||||
|
hx-post="{% url 'generic:user_toggle_group' user.pk perm_group.pk %}?type=auth"
|
||||||
|
hx-target="#auth-groups-{{ user.pk }}"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
>
|
||||||
|
{{ perm_group.name }}
|
||||||
|
<span class="ms-1 text-muted small">×</span>
|
||||||
|
</button>
|
||||||
|
{% else %}
|
||||||
|
<span class="badge bg-info text-dark me-1">{{ perm_group.name }}</span>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
{% else %}
|
||||||
|
<span class="badge bg-light text-muted">No permission groups</span>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if request.user.is_superuser or is_cid_user_manager %}
|
||||||
|
{% if available_auth_groups.count %}
|
||||||
|
<div class="dropdown">
|
||||||
|
<button class="btn btn-sm btn-outline-primary dropdown-toggle" type="button" id="addAuthGroupDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
|
Add
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu" aria-labelledby="addAuthGroupDropdown">
|
||||||
|
{% for ag in available_auth_groups %}
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
class="dropdown-item"
|
||||||
|
hx-post="{% url 'generic:user_toggle_group' user.pk ag.pk %}?type=auth"
|
||||||
|
hx-target="#auth-groups-{{ user.pk }}"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
>
|
||||||
|
{{ ag.name }}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ul class="list-group list-group-flush">
|
<ul class="list-group list-group-flush">
|
||||||
<li class="list-group-item">Grade: <strong>{{ user.userprofile.grade|default:"N/A" }}</strong></li>
|
<li class="list-group-item">Grade: <strong>{{ user.userprofile.grade|default:"N/A" }}</strong></li>
|
||||||
|
|||||||
Reference in New Issue
Block a user