diff --git a/templates/users/detail.html b/templates/users/detail.html index e56117b..8ab373b 100644 --- a/templates/users/detail.html +++ b/templates/users/detail.html @@ -41,8 +41,7 @@ + {% else %}bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-400{% endif %}"> {% for r, label in roles_label.items %}{% if r == role %}{{ label }}{% endif %}{% endfor %}

diff --git a/templates/users/form.html b/templates/users/form.html index f70999e..13915a6 100644 --- a/templates/users/form.html +++ b/templates/users/form.html @@ -97,11 +97,11 @@ {% if can_change_role %} {% else %} - +
Only admins can change roles.
diff --git a/templates/users/list.html b/templates/users/list.html index 09b887d..32a1517 100644 --- a/templates/users/list.html +++ b/templates/users/list.html @@ -17,7 +17,7 @@

{{ page_obj.paginator.count }} active users

- +
@@ -147,9 +147,8 @@ - {{ u.get_role_display|default:u.role|title }} + {% else %}bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-400{% endif %}"> + {{ u.get_role_display|default:u.role }} {% else %} - @@ -273,8 +272,7 @@ :class="{ 'bg-purple-100 text-purple-700 dark:bg-purple-900/40 dark:text-purple-300': viewUser?.role === 'superadmin', 'bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-300': viewUser?.role === 'manager', - 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-300': viewUser?.role === 'member', - 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-300': !['superadmin','manager','member'].includes(viewUser?.role || '') + 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-300': true }" x-text="viewUser?.role_label || viewUser?.role || '—'"> @@ -432,7 +430,7 @@ const usersData = { first_name: "{{ u.first_name|escapejs }}", last_name: "{{ u.last_name|escapejs }}", role: "{{ u.role|default:'' }}", - role_label: "{% if u.role == 'superadmin' %}Superadmin{% elif u.role == 'manager' %}Manager{% elif u.role == 'member' %}Member{% elif u.role == 'guest' %}Guest{% else %}{{ u.role }}{% endif %}", + role_label: "{{ u.get_role_display|default:u.role }}", is_active: {{ u.is_active|yesno:'true,false' }}, date_joined: "{{ u.date_joined|date:'M d, Y' }}", last_login: "{{ u.last_login|date:'M d, Y'|default:'Never' }}",