diff --git a/app/controllers/projects/members_controller.rb b/app/controllers/projects/members_controller.rb new file mode 100644 index 000000000..9c78229dd --- /dev/null +++ b/app/controllers/projects/members_controller.rb @@ -0,0 +1,6 @@ +class Projects::MembersController < Projects::BaseController + def index + users = @project.all_collaborators.like(params[:search]).includes(:user_extension) + @users = kaminari_paginate(users) + end +end \ No newline at end of file diff --git a/app/views/projects/members/index.json.jbuilder b/app/views/projects/members/index.json.jbuilder new file mode 100644 index 000000000..0f605b69c --- /dev/null +++ b/app/views/projects/members/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @users.total_count +json.users do + json.partial! 'users/user_small', users: @users +end diff --git a/config/routes.rb b/config/routes.rb index 5d40ca42c..05681b14a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -429,7 +429,7 @@ Rails.application.routes.draw do get :simple get :watchers, to: 'projects#watch_users' get :stargazers, to: 'projects#praise_users' - get :members, to: 'projects#fork_users' + get :forks, to: 'projects#fork_users' match :about, :via => [:get, :put, :post] end end @@ -585,6 +585,7 @@ Rails.application.routes.draw do end scope module: :projects do + resources :members, only: [:index] resources :teams, only: [:index, :create, :destroy] resources :project_units, only: [:index, :create] resources :applied_transfer_projects, only: [:create] do