Browse Source

Merge branch 'pre_trustie_server' into trustie_server

pull/312/head
“xxq250” 3 years ago
parent
commit
e27657bcec
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      app/queries/projects/list_query.rb

+ 3
- 3
app/queries/projects/list_query.rb View File

@@ -11,7 +11,7 @@ class Projects::ListQuery < ApplicationQuery
end end


def call def call
collection = Project.all
collection = Project.visible
collection = filter_projects(collection) collection = filter_projects(collection)


sort = params[:sort_by] || "updated_on" sort = params[:sort_by] || "updated_on"
@@ -35,9 +35,9 @@ class Projects::ListQuery < ApplicationQuery
def by_search(items) def by_search(items)
ids = Projects::ElasticsearchService.call(params[:search]) ids = Projects::ElasticsearchService.call(params[:search])
if ids.present? if ids.present?
items.visible.where(id: ids).by_name_or_identifier(params[:search])
items.where(id: ids).by_name_or_identifier(params[:search])
else else
items.visible.by_name_or_identifier(params[:search])
items.by_name_or_identifier(params[:search])
end end
end end


Loading…
Cancel
Save