diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0d9e67903..94001d177 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,6 +11,9 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params.merge(is_admin: is_admin, user_id: current_user.try(:id))) @total_count = scope.size + Rails.logger.info("######_____projects_ids____________##############{scope.pluck(:id)}") + Rails.logger.info("######_____projects_u_ids____________##############{scope.pluck(:user_id)}") + @projects = paginate(scope) end diff --git a/app/models/project.rb b/app/models/project.rb index 86932a840..89a5e80e2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -13,7 +13,7 @@ class Project < ApplicationRecord belongs_to :project_language, optional: true , :counter_cache => true has_many :project_trends, dependent: :destroy - has_many :commits, dependent: :destroy + # has_many :commits, dependent: :destroy has_one :project_score, dependent: :destroy has_one :repository, dependent: :destroy diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 41f66680c..1e00ac452 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -23,7 +23,7 @@ class Projects::ListQuery < ApplicationQuery else projects = Project.visible #匿名用户的项目 end - scope = projects.includes(:project_category, :project_language, :repository, owner: :user_extension).like(params[:search]).no_anomory_projects + scope = projects.no_anomory_projects.includes(:project_category, :project_language, :repository, owner: :user_extension).like(params[:search]) .with_project_type(params[:project_type]) .with_project_category(params[:category_id]) .with_project_language(params[:language_id])