users

administration/templates/users_table.html

@@ -130,7 +130,7 @@
                         <th>E-mail</th>
                         <th>Active</th>
                         <th>Staff</th>
-                        <th>Super</th>
+                        <th>Super User</th>
                         <th>Actions</th>
                         </thead>
                         <tbody>
@@ -152,10 +152,14 @@
                                     </td>
                                     <td>
                                         <input type="checkbox" name="is_staff" value="1"
-                                               {% if user.staff == True %}checked{% endif %}>
+                                               {% if not request.user.is_superuser %}disabled{% endif %}
+                                               {% if user.staff == True %}checked{% endif %}
+
+                                        >
                                     </td>
                                     <td>
                                         <input type="checkbox" name="is_superuser" value="1"
+                                               {% if not request.user.is_superuser %}disabled{% endif %}
                                                {% if user.superuser == True %}checked{% endif %}>
                                     </td>
                                     <td>

administration/views.py

@@ -101,30 +101,28 @@ def Dashboard(request):
 
 # ----------------------------------------------------------
 def Request_users(request):
-    if not request.user.is_superuserandnot and request.user.is_staff:
-        return redirect('../')
-    if request.user.is_superuser or request.user.is_staff:
-        user_list = []
-        for user in User.objects.filter(is_active=False):
-            user_list.append({
-                "user_id": user.id,
-                "username": user.username,
-                "first_name": user.first_name,
-                "last_name": user.last_name,
-                "email": user.email,
-                "status": user.is_active,
-                "staff": user.is_staff,
-                "superuser": user.is_superuser,
-            })
-        # messages.success(request, 'your registration is being processed')
-        return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})
-    else:
+    if not request.user.is_superuser and not request.user.is_staff:
         return redirect('../')
+    user_list = []
+    for user in User.objects.filter(is_active=False):
+        user_list.append({
+            "user_id": user.id,
+            "username": user.username,
+            "first_name": user.first_name,
+            "last_name": user.last_name,
+            "email": user.email,
+            "status": user.is_active,
+            "staff": user.is_staff,
+            "superuser": user.is_superuser,
+        })
+    # messages.success(request, 'your registration is being processed')
+    return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})
+
+
 
 # ------------------------------------------------------------------------
 def update_user(request):
-    if not request.user.is_superuserandnot and request.user.is_staff:
-        return redirect('../')
+
     is_active = False
     is_staff = False
     is_superuser = False
@@ -148,23 +146,23 @@ def update_user(request):
 
 #------------------------------------------------------------------------
 def active_users(request):
-    if request.user.is_superuser and request.user.is_staff:
-        user_list = []
-        for user in User.objects.filter(is_active=True):
-            user_list.append({
-                "user_id": user.id,
-                "username": user.username,
-                "first_name": user.first_name,
-                "last_name": user.last_name,
-                "email": user.email,
-                "status": user.is_active,
-                "staff": user.is_staff,
-                "superuser": user.is_superuser,
-            })
-        # messages.success(request, 'your registration is being processed')
-        return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})
-    else:
+    if not request.user.is_superuser and not request.user.is_staff:
         return redirect('../')
+    user_list = []
+    for user in User.objects.filter(is_active=True):
+        user_list.append({
+            "user_id": user.id,
+            "username": user.username,
+            "first_name": user.first_name,
+            "last_name": user.last_name,
+            "email": user.email,
+            "status": user.is_active,
+            "staff": user.is_staff,
+            "superuser": user.is_superuser,
+        })
+    # messages.success(request, 'your registration is being processed')
+    return render(request, 'users_table.html', {'users': user_list, "Viewname": "Request"})
+
 
 # ----------------------------------------------------------------------
 @csrf_exempt