From 4eff5db05b5f7c08b34f360b2391c70ed5b0bdd4 Mon Sep 17 00:00:00 2001
From: mrampant <mathieu.rampant@gmail.com>
Date: Tue, 6 Dec 2022 17:27:33 -0500
Subject: [PATCH] - added more user role filters in admin user page

---
 NEMO/admin.py                                   | 4 +++-
 NEMO/templates/users/create_or_modify_user.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEMO/admin.py b/NEMO/admin.py
index 5c10fe3d..2c21f498 100644
--- a/NEMO/admin.py
+++ b/NEMO/admin.py
@@ -998,10 +998,12 @@ class UserAdmin(admin.ModelAdmin):
 		"is_active",
 		"domain",
 		"is_staff",
+		"is_user_office",
+		"is_accounting_officer",
 		"is_facility_manager",
+		"is_superuser",
 		"is_technician",
 		"is_service_personnel",
-		"is_superuser",
 		"date_joined",
 		"last_login",
 	)
diff --git a/NEMO/templates/users/create_or_modify_user.html b/NEMO/templates/users/create_or_modify_user.html
index 5e8cc118..0cfb8d4f 100644
--- a/NEMO/templates/users/create_or_modify_user.html
+++ b/NEMO/templates/users/create_or_modify_user.html
@@ -59,7 +59,7 @@
 			{% endif %}
 		</div>
 		<div class="form-group">
-			<label class="control-label col-sm-2" for="username"><strong>User name</strong></label>
+			<label class="control-label col-sm-2" for="username"><strong>Username</strong></label>
 			<div class="col-sm-4">
 				<input id="username" name="username" type="text" autocomplete="off" class="form-control" value="{{ form.username.value|default_if_none:"" }}" required>
 			</div>