seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

vrfs-988: refactoring search as text by entity, rather than site-wide

This commit is contained in:
Jonathan Kolyer 2014-01-11 06:27:05 -06:00
parent 3d75f8dd97
commit 2229babf68
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/sidebar.js
View File

@ -432,8 +432,8 @@
if (query === '') {
return hideSearchResults();
}
if (query.length > 2) {
query += '&srch_t='+$('#search_text_type').val();
emptySearchResults();
search(query);
}

15
web/app/controllers/api_search_controller.rb
View File

@ -6,18 +6,17 @@ class ApiSearchController < ApiController
respond_to :json
def index
if 1 == params[Search::PARAM_MUSICIAN].to_i
if 1 == params[Search::PARAM_MUSICIAN].to_i || 1 == params[Search::PARAM_BAND].to_i
query = params.clone
query[:remote_ip] = request.remote_ip
@search = Search.musician_search(query, current_user)
respond_with @search, responder: ApiResponder, :status => 200
elsif 1 == params[Search::PARAM_BAND].to_i
query = params.clone
query[:remote_ip] = request.remote_ip
@search = Search.band_search(query, current_user)
if 1 == params[Search::PARAM_MUSICIAN].to_i
@search = Search.musician_filter(query, current_user)
else
@search = Search.band_filter(query, current_user)
end
respond_with @search, responder: ApiResponder, :status => 200
else
@search = Search.search(params[:query], current_user.id)
@search = Search.text_search(params, current_user)
end
end
end

10
web/app/views/clients/_sidebar.html.erb
View File

@ -25,13 +25,7 @@
</div>
<!-- search filter dropdown -->
<div class="right">
Show:
<select>
<option>Musicians</option>
<option>Bands</option>
<option>Fans</option>
<option>Recordings</option>
</select>
Show:&nbsp;<%= select_tag(Search::SEARCH_TEXT_TYPE_ID, options_for_select(Search::SEARCH_TEXT_TYPES.collect { |ii| [ii.to_s.titleize, ii] })) %>
</div>
</div>
</div>
@ -200,4 +194,4 @@
</div>
<br clear="all" />
</li>
</script>
</script>