From bb2122d854043cbbf59238501a82462a6600476b Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Mon, 23 Jan 2017 17:39:21 -0500 Subject: [PATCH] more --- app/controllers/main_controller.rb | 3 ++- app/controllers/search_controller.rb | 4 ++-- app/controllers/topics_controller.rb | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 1204eb33..38d9458c 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -19,7 +19,8 @@ class MainController < ApplicationController end # GET /request - def requestinvite; end + def requestinvite + end private diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 36ae0b9d..8edf0324 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -142,8 +142,8 @@ class SearchController < ApplicationController if term && !term.empty? @synapses = policy_scope(Synapse) - .where('LOWER("desc") like ?', '%' + term.downcase.strip + '%') - .order('"desc"') + .where('LOWER("desc") like ?', '%' + term.downcase.strip + '%') + .order('"desc"') @synapses = @synapses.uniq(&:desc) elsif topic1id && !topic1id.empty? diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index a9067b17..1193dbee 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -11,13 +11,15 @@ class TopicsController < ApplicationController def autocomplete_topic term = params[:term] if term && !term.empty? - topics = policy_scope(Topic).where('LOWER("name") like ?', term.downcase + '%').order('"name"') + topics = policy_scope(Topic) + .where('LOWER("name") like ?', term.downcase + '%') + .order('"name"') map_topics = topics.select { |t| t&.metacode&.name == 'Metamap' } # prioritize topics which point to maps, over maps exclude = map_topics.length.positive? ? map_topics.map(&:name) : [''] maps = policy_scope(Map) - .where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', exclude) - .order('"name"') + .where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', exclude) + .order('"name"') else topics = [] maps = []