Fixed remove user error

Author: AleDouglas

Alpha/backend/lib/views/admin_area.py

@@ -58,8 +58,8 @@ def post(self, request ,*args, **kwargs):
 def delete_user(request, user_id):
     try:
         if request.user.is_staff:
-            user = CustomUser.objects.get(id=int(user_id))
-            if len(CustomUser.objects.filter(is_staff=True)) < 2:
+            user = CustomUser.objects.get(id=int(user_id)) # Get user
+            if (len(CustomUser.objects.filter(is_staff=True)) < 2) and (user.is_staff == True):
                 return JsonResponse({'success': False, 'result_user': 'Problem deleting user: Make sure there is more than one admin account on the system'})
             activity = GetProject.create_activity(user=request.user, description=f'Admin #{request.user.id} delete user ID #{user_id}')
             user.delete()

Alpha/backend/lib/views/members.py

@@ -94,7 +94,6 @@ def delete_member(request, project_id, user_id):
             user = CustomUser.objects.get(id=int(user_id))
         except:
             return JsonResponse({'success': False, 'message': 'User not found'})
-        #print(user.username)
         project.members.remove(user)
         activity = GetProject.create_activity(project = project, user=request.user, description=f'USER #{request.user.id} remove a member ID #{user_id} from project #{project_id}')
         return JsonResponse({'success': True, 'message': 'Member deleted.'})