From b9c12d8f5d4ef249d1e05121978e71a73f4a6dfe Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 29 May 2020 12:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9issues=E8=BF=94=E5=9B=9Ecount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 10 +++++++--- app/views/journals/index.json.jbuilder | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index d1501ac1d..35690ea56 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -7,9 +7,13 @@ class JournalsController < ApplicationController def index @page = params[:page] || 1 @limit = params[:limit] || 10 - journals = @issue.journals.journal_includes.order("created_on desc") - @journals_size = journals.size - @journals = journals.parent_journals.page(@page).per(@limit) + total_journals = @issue.journals.journal_includes + @jounals_total = total_journals.size + parent_journals =journals.parent_journals.order("created_on desc") + @journals = parent_journals.order("created_on desc").page(@page).per(@limit) + @journals_size = parent_journals.size + + end def create diff --git a/app/views/journals/index.json.jbuilder b/app/views/journals/index.json.jbuilder index 2485e72bd..99df015c9 100644 --- a/app/views/journals/index.json.jbuilder +++ b/app/views/journals/index.json.jbuilder @@ -1,6 +1,7 @@ json.partial! "commons/success" json.limit @limit json.journals_count @journals_size +json.journals_total_count @jounals_total json.issue_journals do json.array! @journals do |journal| json.partial! "journals/journal_item", journal: journal