更改:部分接口传参以及路由修复
This commit is contained in:
parent
4085da7837
commit
1aeed8236d
|
@ -5,6 +5,7 @@ class Api::V1::Issues::AssignersController < Api::V1::BaseController
|
||||||
# 负责人列表
|
# 负责人列表
|
||||||
def index
|
def index
|
||||||
@assigners = User.joins(assigned_issues: :project).where(projects: {id: @project&.id})
|
@assigners = User.joins(assigned_issues: :project).where(projects: {id: @project&.id})
|
||||||
|
@assigners = @assigners.order("users.id=#{current_user.id} desc, issue_assigners.created_at desc").distinct
|
||||||
@assigners = kaminary_select_paginate(@assigners)
|
@assigners = kaminary_select_paginate(@assigners)
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -4,6 +4,7 @@ class Api::V1::Issues::AuthorsController < Api::V1::BaseController
|
||||||
# 发布人列表
|
# 发布人列表
|
||||||
def index
|
def index
|
||||||
@authors = User.joins(issues: :project).where(projects: {id: @project&.id})
|
@authors = User.joins(issues: :project).where(projects: {id: @project&.id})
|
||||||
|
@authors = @authors.order("users.id=#{current_user.id} desc").distinct
|
||||||
@authors = kaminary_select_paginate(@authors)
|
@authors = kaminary_select_paginate(@authors)
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -5,7 +5,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
|
||||||
def index
|
def index
|
||||||
@issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}")
|
@issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}")
|
||||||
if params[:only_name]
|
if params[:only_name]
|
||||||
@issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name))
|
@issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color))
|
||||||
else
|
else
|
||||||
@issue_tags = kaminari_paginate(@issue_tags)
|
@issue_tags = kaminari_paginate(@issue_tags)
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,7 +12,7 @@ class Users::RegisterService < ApplicationService
|
||||||
namespace = strip(@namespace)
|
namespace = strip(@namespace)
|
||||||
password = strip(@password)
|
password = strip(@password)
|
||||||
|
|
||||||
Rails.logger.info "Users::RegisterService params: ##### #{params} "
|
# Rails.logger.info "Users::RegisterService params: ##### #{params} "
|
||||||
|
|
||||||
email, phone =
|
email, phone =
|
||||||
if register_type == 1
|
if register_type == 1
|
||||||
|
|
|
@ -25,9 +25,7 @@ defaults format: :json do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# projects文件夹下的
|
resources :issues
|
||||||
scope module: :projects do
|
|
||||||
resources :issues
|
|
||||||
scope module: :issues do
|
scope module: :issues do
|
||||||
resources :issue_tags, only: [:index]
|
resources :issue_tags, only: [:index]
|
||||||
resources :milestones, except: [:new, :edit]
|
resources :milestones, except: [:new, :edit]
|
||||||
|
@ -36,6 +34,8 @@ defaults format: :json do
|
||||||
resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
|
resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# projects文件夹下的
|
||||||
|
scope module: :projects do
|
||||||
resources :pulls, module: 'pulls' do
|
resources :pulls, module: 'pulls' do
|
||||||
resources :versions, only: [:index] do
|
resources :versions, only: [:index] do
|
||||||
member do
|
member do
|
||||||
|
|
Loading…
Reference in New Issue