api/admin_views.py

@@ -1703,12 +1703,13 @@ def complement_code_contacted(request, administrator):

                 def administrator_list(request, administrator):
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                -
              

                -    if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
              

                -        return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
              

                +    admin_type = request.POST.get('admin_type', '')
              

                 
              

                     logs = AdministratorInfo.objects.filter(status=True).order_by('-created_at')
              

                 
              

                +    if admin_type:
              

                +        logs = logs.filter(admin_type=admin_type)
              

                +
              

                     count = logs.count()
              

                     logs, left = pagination(logs, page, num)
              

                     logs = [log.admindata for log in logs]
              

api/tenancy_admin_views.py

@@ -125,6 +125,7 @@ def shot_request_list(request, administrator):

                     num = request.POST.get('num', 20)
              

                     query = request.POST.get('query', '')
              

                     model_id = request.POST.get('model_id', '')
              

                +    target_admin_id = request.POST.get('target_admin_id', '')
              

                     start_time = request.POST.get('start_time', '')
              

                     end_time = request.POST.get('end_time', '')
              

                     request_status = request.POST.get('request_status', 'all')
              
@@ -138,6 +139,9 @@ def shot_request_list(request, administrator):

                     if model_id:
              

                         reqs = reqs.filter(model_id=model_id)
              

                 
              

                +    if target_admin_id:
              

                +        reqs = reqs.filter(admin_id=target_admin_id)
              

                +
              

                     if request_status != 'all':
              

                         reqs = reqs.filter(request_status=request_status)