ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance user group management by adding support for Django auth groups and improving group toggle functionality for superusers and user managers

Browse Source
This commit is contained in:
Ross
2025-11-03 12:25:29 +00:00
parent ff02e3f02f
commit 68dc7c05d8
3 changed files with 151 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/templates/generic/partials/user_groups_fragment.html
+95 -41
View File
@@ -1,48 +1,102 @@
{% load i18n %}
<div id="user-groups-{{ user.pk }}">
<div class="d-flex flex-wrap gap-2 align-items-center">
{% if user.user_groups.all %}
{% for group in user.user_groups.all %}
{% if request.user.is_superuser %}
<button
class="btn btn-sm btn-outline-secondary"
hx-post="{% url 'generic:user_toggle_group' user.pk group.pk %}"
hx-target="#user-groups-{{ user.pk }}"
hx-swap="outerHTML"
>
{{ group.name }}
<span class="ms-1 text-muted small">&times;</span>
</button>
<div class="d-flex flex-column gap-2">
<div>
<small class="text-muted">Project groups:</small>
<div class="d-flex flex-wrap gap-2 mt-1">
{% if user.user_groups.all %}
{% for group in user.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 %}"
hx-target="#user-groups-{{ user.pk }}"
hx-swap="outerHTML"
>
{{ group.name }}
<span class="ms-1 text-muted small">&times;</span>
</button>
{% else %}
<a class="btn btn-sm btn-outline-secondary" href="{% url 'generic:user_group_detail' group.pk %}">{{ group.name }}</a>
{% endif %}
{% endfor %}
{% else %}
<a class="btn btn-sm btn-outline-secondary" href="{% url 'generic:user_group_detail' group.pk %}">{{ group.name }}</a>
<div class="text-muted">No groups.</div>
{% endif %}
{% endfor %}
{% else %}
<div class="text-muted">No groups.</div>
{% endif %}
{% if request.user.is_superuser %}
{% if available_groups.count %}
<div class="dropdown">
<button class="btn btn-sm btn-outline-primary dropdown-toggle" type="button" id="addGroupDropdown" data-bs-toggle="dropdown" aria-expanded="false">
Add group
</button>
<ul class="dropdown-menu" aria-labelledby="addGroupDropdown">
{% for ag in available_groups %}
<li>
<button
class="dropdown-item"
hx-post="{% url 'generic:user_toggle_group' user.pk ag.pk %}"
hx-target="#user-groups-{{ user.pk }}"
hx-swap="outerHTML"
>
{{ ag.name }}
</button>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endif %}
{% if request.user.is_superuser or is_cid_user_manager %}
{% if available_groups.count %}
<div class="dropdown">
<button class="btn btn-sm btn-outline-primary dropdown-toggle" type="button" id="addGroupDropdown" data-bs-toggle="dropdown" aria-expanded="false">
Add group
</button>
<ul class="dropdown-menu" aria-labelledby="addGroupDropdown">
{% for ag in available_groups %}
<li>
<button
class="dropdown-item"
hx-post="{% url 'generic:user_toggle_group' user.pk ag.pk %}"
hx-target="#user-groups-{{ user.pk }}"
hx-swap="outerHTML"
>
{{ ag.name }}
</button>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endif %}
</div>
</div>
<div>
<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">&times;</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>