From 6b3794b57ba579ffb9eee8235391ce4e77674268 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 10:56:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=90=9C=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 4 +++- app/views/projects/index.json.jbuilder | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d54b224b7..e0c0c8f4f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,9 +11,11 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params.merge(is_admin: is_admin, user_id: current_user.try(:id))) @total_count = scope.size + projects = paginate(scope) Rails.logger.info("########_________scope_ids_________________#########{scope.pluck(:id)}") + Rails.logger.info("########_________projects_ids_________________#########{projects.pluck(:id)}") - @projects = paginate(scope) + @projects =projects # @projects = scope.page(params[:page]).limit(params[:limit] || 15) end diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 587abee89..13de5d2f9 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.projects do - json.array! @projects.each do |project| - Rails.logger.info("#######_______project.id________########{project.id}") + json.array! @projects do |project| json.partial! 'project', project: project json.author do json.name project&.owner&.login