df9a42c397
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec Fixed merged conflict in Changelog update routes and search controller remove useless except from search controller Fix indentation in search_controller
26 lines
668 B
Ruby
26 lines
668 B
Ruby
class SearchController < ApplicationController
|
|
before_filter :authenticate_user!
|
|
|
|
def search
|
|
if search_query.starts_with?('#')
|
|
if search_query.length > 1
|
|
respond_to do |format|
|
|
format.json {redirect_to tags_path(:q => search_query.delete("#."))}
|
|
format.html {redirect_to tag_path(:name => search_query.delete("#."))}
|
|
end
|
|
else
|
|
flash[:error] = I18n.t('tags.show.none', :name => search_query)
|
|
redirect_to :back
|
|
end
|
|
else
|
|
redirect_to people_path(:q => search_query)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def search_query
|
|
@search_query ||= params[:q] || params[:term] || ''
|
|
end
|
|
|
|
end
|