floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修改issues的列表错误

This commit is contained in:
sylor_huang@126.com 2020-05-08 15:29:01 +08:00
parent a5be19f3a3
commit a14b0b2eb1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -20,7 +20,7 @@ class IssuesController < ApplicationController
@close_issues_size = issues.where(status_id: 5).size @close_issues_size = issues.where(status_id: 5).size
@assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
@my_published_size = issues.where(author_id: current_user&.id).size @my_published_size = issues.where(author_id: current_user&.id).size
scopes = Issues::ListQueryService.call(issues,params) scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?})
@issues_size = scopes.size @issues_size = scopes.size
@issues = paginate(scopes) @issues = paginate(scopes)

2
app/controllers/pull_requests_controller.rb
View File

@ -18,7 +18,7 @@ class PullRequestsController < ApplicationController
@my_published_size = issues.where(author_id: current_user&.id).size @my_published_size = issues.where(author_id: current_user&.id).size
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user)) @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
scopes = Issues::ListQueryService.call(issues,params) scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?})
@issues_size = scopes.size @issues_size = scopes.size
@issues = paginate(scopes) @issues = paginate(scopes)
end end

2
app/services/issues/list_query_service.rb
View File

@ -40,7 +40,7 @@ class Issues::ListQueryService < ApplicationService
order_type = params[:order_type] || "desc" #或者"asc" order_type = params[:order_type] || "desc" #或者"asc"
order_name = params[:order_name] || "created_on" #或者"updated_on" order_name = params[:order_name] || "created_on" #或者"updated_on"
issues.order("issues.#{order_name} #{order_type}") issues.reorder("issues.#{order_name} #{order_type}")
end end
end end