From f6475c8452739011d6df7eae3a1200ff0b1a8a7f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 11:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 5 +---- app/views/projects/index.json.jbuilder | 9 ++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8df84579..618c3057 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,11 +11,8 @@ 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 =projects + @projects = paginate(scope) end def create diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 3dfdf1ad..640ac11f 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,12 +1,11 @@ json.total_count @total_count json.projects do - Rails.logger.info("########__________@projects________############{@projects}") - json.array! @projects.each do |project| + json.array! @projects.to_a do |project| json.partial! 'project', project: project json.author do - json.name project&.owner&.login - json.login project&.owner&.login - json.image_url url_to_avatar(project&.owner) + json.name project.owner.login + json.login project.owner.login + json.image_url url_to_avatar(project.owner) end json.category do if project.project_category.blank?