From 3f81d2ab5d8bd7dc079025bafa1fe1fcb15e6bac Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 11:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9like=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/models/concerns/matchable.rb | 5 ++++- app/views/projects/index.json.jbuilder | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 768994586..658c72b18 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -18,7 +18,7 @@ class ProjectsController < ApplicationController 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/models/concerns/matchable.rb b/app/models/concerns/matchable.rb index 13fcff80d..182756de4 100644 --- a/app/models/concerns/matchable.rb +++ b/app/models/concerns/matchable.rb @@ -2,8 +2,11 @@ module Matchable extend ActiveSupport::Concern included do + # scope :like, lambda { |keywords| + # joins(:repository).where(%w[ projects.name projects.identifier repositories.identifier ].map { |f| "LOWER(#{f}) LIKE :q" }.join(' OR '), q: "%#{keywords.split(" ").join('|')}%") unless keywords.blank? + # } scope :like, lambda { |keywords| - joins(:repository).where(%w[ projects.name projects.identifier repositories.identifier ].map { |f| "LOWER(#{f}) LIKE :q" }.join(' OR '), q: "%#{keywords.split(" ").join('|')}%") unless keywords.blank? + joins(:repository).where("projects.name like ? or repositories.identifier like ?", "%#{keywords}","%#{keywords}") unless keywords.blank? } scope :with_project_category, ->(category_id) { where(project_category_id: category_id) unless category_id.blank? } scope :with_project_language, ->(language_id) { where(project_language_id: language_id) unless language_id.blank? } diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 86f3365b2..b4e150314 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,5 +1,4 @@ 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