From 700537f4e28326c5587be442949f11f0c332b72d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 8 May 2020 14:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 5 +---- app/controllers/pull_requests_controller.rb | 5 +---- app/services/issues/list_query_service.rb | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index d54125726..154d94097 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -21,11 +21,8 @@ class IssuesController < ApplicationController @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size @my_published_size = issues.where(author_id: current_user&.id).size scopes = Issues::ListQueryService.call(issues,params) - - @page = params[:page] - @limit = params[:limit] || 15 @issues_size = scopes.size - @issues = scopes.page(@page).per(@limit) + @issues = paginate(scopes) respond_to do |format| format.json diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 75abc437e..691552576 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -19,11 +19,8 @@ class PullRequestsController < ApplicationController @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user)) scopes = Issues::ListQueryService.call(issues,params) - - @page = params[:page] - @limit = params[:limit] || 15 @issues_size = scopes.size - @issues = scopes.page(@page).per(@limit) + @issues = paginate(scopes) end def new diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index e39b166b9..46af67377 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -41,7 +41,7 @@ class Issues::ListQueryService < ApplicationService order_type = params[:order_type] || "desc" #或者"asc" order_name = params[:order_name] || "created_on" #或者"updated_on" - issues.order("#{order_name} #{order_type}") + issues.reorder("#{order_name} #{order_type}") end