From 861a84d8ecd04ae122c223e3637cbfde078a7b4e Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Tue, 21 Jun 2022 10:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=9B=B7=E4=B8=BB=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=8E=92=E7=AC=AC=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 1 + app/views/projects/index.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d69fb4b5..3d8fcf2f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -32,6 +32,7 @@ class ProjectsController < ApplicationController @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)) # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) + @rand_projects = ([Project.find_by(id: 477)] | @projects) if param[:page].to_i == 1 category_id = params[:category_id] @total_count = @projects.total_count if category_id.blank? diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 50aaa5e5..d5c919cc 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,5 +1,5 @@ json.total_count @projects.total_count -json.projects ([Project.find_by(id: 477)] | @projects) do |project| +json.projects @rand_projects do |project| # json.partial! "/projects/project_detail", project: project json.id project.id json.repo_id project&.repository&.id