diff --git a/app/controllers/api/v1/issues/assigners_controller.rb b/app/controllers/api/v1/issues/assigners_controller.rb index 421ae2eda..b2b15a90a 100644 --- a/app/controllers/api/v1/issues/assigners_controller.rb +++ b/app/controllers/api/v1/issues/assigners_controller.rb @@ -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 \ No newline at end of file diff --git a/app/controllers/api/v1/issues/authors_controller.rb b/app/controllers/api/v1/issues/authors_controller.rb index 8c7a4f7e6..8a5dbcdce 100644 --- a/app/controllers/api/v1/issues/authors_controller.rb +++ b/app/controllers/api/v1/issues/authors_controller.rb @@ -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 \ No newline at end of file diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 2b03c94fe..3fa46a4da 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -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 diff --git a/app/services/users/register_service.rb b/app/services/users/register_service.rb index bb3b3ada1..bb984477f 100644 --- a/app/services/users/register_service.rb +++ b/app/services/users/register_service.rb @@ -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 diff --git a/config/routes/api.rb b/config/routes/api.rb index 6c262ddd0..657ca52bd 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -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