fix admin controller index api find
fixes CNVS-16807 test plan - account admin index should find user by sis_id Change-Id: Ife67825c388c9d08802e12e2bfc2155aee573da1 Reviewed-on: https://gerrit.instructure.com/44219 Reviewed-by: Cody Cutrer <cody@instructure.com> Tested-by: Shawn Meredith <shawn@instructure.com> Product-Review: Rob Orton <rob@instructure.com> QA-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
parent
0c5e957e12
commit
b0cccba800
|
@ -127,9 +127,9 @@ class AdminsController < ApplicationController
|
|||
# @returns [Admin]
|
||||
def index
|
||||
if authorized_action(@context, @current_user, :manage_account_memberships)
|
||||
user = api_find(User, params[:user_id])
|
||||
users = api_find_all(User, Array(params[:user_id])) if params[:user_id]
|
||||
scope = @context.account_users
|
||||
scope = scope.where(user_id: user) if params[:user_id]
|
||||
scope = scope.where(user_id: users) if users
|
||||
route = polymorphic_url([:api_v1, @context, :admins])
|
||||
admins = Api.paginate(scope.order(:id), self, route)
|
||||
render :json => admins.collect{ |admin| admin_json(admin, @current_user, session) }
|
||||
|
|
Loading…
Reference in New Issue