From aced4885d72afd525f92af2adf67a627a71dba2e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 11:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 8 +++++++- app/views/projects/index.json.jbuilder | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 618c30571..768994586 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,8 +11,14 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params.merge(is_admin: is_admin, user_id: current_user.try(:id))) @total_count = scope.size + other_projects = scope.page(params[:page]).limit(params[:limit] || 15) + projects = paginate(scope) + Rails.logger.info("##########____other_projects_projects_as_json__________#############{other_projects.as_json}") - @projects = paginate(scope) + Rails.logger.info("##########____projects_as_json__________#############{projects.as_json}") + @projects = projects + Rails.logger.info("##########___@projects__________#############{@projects.as_json}") + @projects end def create diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index e4052da18..86f3365b2 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,7 +1,6 @@ json.total_count @total_count json.all_projects @projects.as_json json.projects do - json.array! @projects.to_a do |project| json.partial! 'project', project: project json.author do