This commit is contained in:
Devin Howard 2017-01-23 17:39:21 -05:00
parent 77d39e445a
commit bb2122d854
3 changed files with 9 additions and 6 deletions

View file

@ -19,7 +19,8 @@ class MainController < ApplicationController
end end
# GET /request # GET /request
def requestinvite; end def requestinvite
end
private private

View file

@ -142,8 +142,8 @@ class SearchController < ApplicationController
if term && !term.empty? if term && !term.empty?
@synapses = policy_scope(Synapse) @synapses = policy_scope(Synapse)
.where('LOWER("desc") like ?', '%' + term.downcase.strip + '%') .where('LOWER("desc") like ?', '%' + term.downcase.strip + '%')
.order('"desc"') .order('"desc"')
@synapses = @synapses.uniq(&:desc) @synapses = @synapses.uniq(&:desc)
elsif topic1id && !topic1id.empty? elsif topic1id && !topic1id.empty?

View file

@ -11,13 +11,15 @@ class TopicsController < ApplicationController
def autocomplete_topic def autocomplete_topic
term = params[:term] term = params[:term]
if term && !term.empty? 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' } map_topics = topics.select { |t| t&.metacode&.name == 'Metamap' }
# prioritize topics which point to maps, over maps # prioritize topics which point to maps, over maps
exclude = map_topics.length.positive? ? map_topics.map(&:name) : [''] exclude = map_topics.length.positive? ? map_topics.map(&:name) : ['']
maps = policy_scope(Map) maps = policy_scope(Map)
.where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', exclude) .where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', exclude)
.order('"name"') .order('"name"')
else else
topics = [] topics = []
maps = [] maps = []