Browse Source

更改:部分接口传参以及路由修复

pull/342/head
yystopf 3 years ago
parent
commit
1aeed8236d
5 changed files with 7 additions and 5 deletions
  1. +1
    -0
      app/controllers/api/v1/issues/assigners_controller.rb
  2. +1
    -0
      app/controllers/api/v1/issues/authors_controller.rb
  3. +1
    -1
      app/controllers/api/v1/issues/issue_tags_controller.rb
  4. +1
    -1
      app/services/users/register_service.rb
  5. +3
    -3
      config/routes/api.rb

+ 1
- 0
app/controllers/api/v1/issues/assigners_controller.rb View File

@@ -5,6 +5,7 @@ class Api::V1::Issues::AssignersController < Api::V1::BaseController
# 负责人列表
def index
@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)
end
end

+ 1
- 0
app/controllers/api/v1/issues/authors_controller.rb View File

@@ -4,6 +4,7 @@ class Api::V1::Issues::AuthorsController < Api::V1::BaseController
# 发布人列表
def index
@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)
end
end

+ 1
- 1
app/controllers/api/v1/issues/issue_tags_controller.rb View File

@@ -5,7 +5,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
def index
@issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}")
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
@issue_tags = kaminari_paginate(@issue_tags)
end


+ 1
- 1
app/services/users/register_service.rb View File

@@ -12,7 +12,7 @@ class Users::RegisterService < ApplicationService
namespace = strip(@namespace)
password = strip(@password)

Rails.logger.info "Users::RegisterService params: ##### #{params} "
# Rails.logger.info "Users::RegisterService params: ##### #{params} "

email, phone =
if register_type == 1


+ 3
- 3
config/routes/api.rb View File

@@ -25,9 +25,7 @@ defaults format: :json do
end
end

# projects文件夹下的
scope module: :projects do
resources :issues
resources :issues
scope module: :issues do
resources :issue_tags, only: [:index]
resources :milestones, except: [:new, :edit]
@@ -36,6 +34,8 @@ defaults format: :json do
resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
end

# projects文件夹下的
scope module: :projects do
resources :pulls, module: 'pulls' do
resources :versions, only: [:index] do
member do


Loading…
Cancel
Save