From 14d5ddb23fac9e14410cba3014c7c569b5e1983f Mon Sep 17 00:00:00 2001 From: Scott Comer Date: Fri, 30 May 2014 14:12:27 -0500 Subject: [PATCH] fix the correct musician search query for scoring --- web/app/controllers/api_search_controller.rb | 1 + web/app/views/clients/_web_filter.html.erb | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/web/app/controllers/api_search_controller.rb b/web/app/controllers/api_search_controller.rb index cabcf557a..468371a79 100644 --- a/web/app/controllers/api_search_controller.rb +++ b/web/app/controllers/api_search_controller.rb @@ -13,6 +13,7 @@ class ApiSearchController < ApiController if 1 == query[Search::PARAM_MUSICIAN].to_i clientid = query[:clientid] conn = (clientid ? Connection.where(client_id: clientid, user_id: current_user.id).first : nil) + # puts "================== query #{query.inspect}" @search = Search.musician_filter(query, current_user, conn) else @search = Search.band_filter(query, current_user) diff --git a/web/app/views/clients/_web_filter.html.erb b/web/app/views/clients/_web_filter.html.erb index d4b41c699..5beed3237 100644 --- a/web/app/views/clients/_web_filter.html.erb +++ b/web/app/views/clients/_web_filter.html.erb @@ -47,6 +47,16 @@ <%= content_tag(:div, 'Show:', :class => 'filter-element desc') %> <%= select_tag("#{filter_label}_show", options_for_select(Search::SHOW_OPTS), {:class => "easydropdown"}) %> + <% elsif :musician == filter_label %> + + <%= content_tag(:div, 'Latency:', :class => 'filter-element desc') %> + <%= content_tag(:div, :class => 'query-distance-params') do -%> + <%= select_tag("musician_query_score", options_for_select(Search::M_SCORE_OPTS, Search::M_SCORE_DEFAULT), {:class => 'easydropdown'}) %> + <% end -%> + <%= content_tag(:div, :class => 'filter-element desc') do -%> + to <%= content_tag(:span, current_user ? current_user.current_city(request.remote_ip) : '', :id => "musician-filter-city") %> + <% end -%> + <% else %> <%= content_tag(:div, 'Within', :class => 'filter-element desc') %> @@ -57,7 +67,7 @@ <%= content_tag(:div, :class => 'filter-element desc') do -%> miles of <%= content_tag(:span, current_user ? current_user.current_city(request.remote_ip) : '', :id => "#{filter_label}-filter-city") %> <% end -%> - + <% end %> <% end -%>