Browse Source

分页的部分修改

tags/v1
sylor_huang@126.com 6 years ago
parent
commit
700537f4e2
3 changed files with 3 additions and 9 deletions
  1. +1
    -4
      app/controllers/issues_controller.rb
  2. +1
    -4
      app/controllers/pull_requests_controller.rb
  3. +1
    -1
      app/services/issues/list_query_service.rb

+ 1
- 4
app/controllers/issues_controller.rb View File

@@ -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


+ 1
- 4
app/controllers/pull_requests_controller.rb View File

@@ -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


+ 1
- 1
app/services/issues/list_query_service.rb View File

@@ -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


Loading…
Cancel
Save