Merge remote-tracking branch 'origin/trustie_server' into trustie_server
This commit is contained in:
commit
48a60a4abc
|
@ -3,7 +3,7 @@ class Api::V1::ProjectTopicsController < Api::V1::BaseController
|
|||
def index
|
||||
@project_topics = ProjectTopic
|
||||
@project_topics = @project_topics.ransack(name_cont: params[:keyword]) if params[:keyword].present?
|
||||
@project_topics = @project_topics.includes(:projects)
|
||||
# @project_topics = @project_topics.includes(:projects)
|
||||
@project_topics = kaminary_select_paginate(@project_topics)
|
||||
end
|
||||
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
class Api::V1::UsersController < Api::V1::BaseController
|
||||
|
||||
before_action :load_observe_user
|
||||
before_action :check_auth_for_observe_user
|
||||
before_action :load_observe_user, except: [:check_user_id]
|
||||
before_action :check_auth_for_observe_user, except: [:check_user_id]
|
||||
|
||||
def check_user_id
|
||||
return tip_exception(-1, "用户ID不存在") unless params[:user_id].present? && User.exists?(id: params[:user_id])
|
||||
render_ok
|
||||
end
|
||||
|
||||
def send_email_vefify_code
|
||||
code = %W(0 1 2 3 4 5 6 7 8 9)
|
||||
|
|
|
@ -1,6 +1,13 @@
|
|||
defaults format: :json do
|
||||
namespace :api do
|
||||
namespace :v1 do
|
||||
|
||||
resources :users, only: [:index] do
|
||||
collection do
|
||||
post :check_user_id
|
||||
end
|
||||
end
|
||||
|
||||
scope ':owner' do
|
||||
resource :users, path: '/', only: [:update, :edit, :destroy] do
|
||||
collection do
|
||||
|
|
Loading…
Reference in New Issue