Download as
Browse Code »

Commit d3482d96536d851a7a10af582ae6dfacfb267fce

Authored by MoisesMachado
1 parent a528d454
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem129: an initial form form specifing the parameters for search for sellers 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1776 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 41 additions and 2 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @d3482d9
@@ -122,8 +122,11 @@ class SearchController < ApplicationController @@ -122,8 +122,11 @@ class SearchController < ApplicationController
122 end 122 end
123 123
124 def sellers 124 def sellers
  125 + @categories = ProductCategory.find(:all)
  126 + @regions = Region.find(:all).select{|r|r.lat && r.lng}
  127 + @product_category = ProductCategory.find(params[:category]) if params[:category]
  128 + @region = Region.find(params[:region]) if params[:region]
125 options = {} 129 options = {}
126 - @product_category = ProductCategory.find_by_path(params[:product_category].join('/')) if params[:product_category]  
127 options.merge!({:include => :products, :conditions => ['products.product_category_id = ?', @product_category.id]}) if @product_category 130 options.merge!({:include => :products, :conditions => ['products.product_category_id = ?', @product_category.id]}) if @product_category
128 options.merge!({:origin => [params[:lat].to_f, params[:long].to_f], :within => params[:radius] }) if params[:lat] && params[:long] && params[:radius] 131 options.merge!({:origin => [params[:lat].to_f, params[:long].to_f], :within => params[:radius] }) if params[:lat] && params[:long] && params[:radius]
129 @enterprises = Enterprise.find(:all, options) 132 @enterprises = Enterprise.find(:all, options)
app/views/search/sellers.rhtml 0 → 100644
  Diff comments   View file @d3482d9
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +<h2>
  2 +<% if @product_category %>
  3 + <% if params[:lat] && params[:long] && params[:radius] %>
  4 + <%= _('Listing sellers of %s witin %s km from %s %s') % [@product_category.name, params[:radius], params[:lat], params[:long]] %>
  5 + <% else %>
  6 + <%= _('Listing sellers of %s') % @product_category.name %>
  7 + <% end %>
  8 +<% else %>
  9 + <% if params[:lat] && params[:long] && params[:radius] %>
  10 + <%= _('Listing sellers witin %s km from %s %s') % [params[:radius], params[:lat], params[:long]] %>
  11 + <% else %>
  12 + <%= _('Listing sellers') %>
  13 + <% end %>
  14 +<% end %>
  15 +</h2>
  16 +
  17 +<% form_tag({}, {:method => 'get'}) do %>
  18 + <%= _('Category: ') %> <%= select_tag 'category', options_from_collection_for_select(@categories, :id, :name, @product_category) %><br/>
  19 + <%= _('Distance form point: ') %> <%= text_field_tag 'radius' %><br/>
  20 + <%= _('Region') %> <%= select_tag 'region', options_from_collection_for_select(@regions, :id, :name, @region) %><br/>
  21 + <%= submit_tag _('Search') %>
  22 +<% end %>
  23 +
  24 +<div class="search-results-innerbox search-results-type-profile common-profile-list-block %>">
  25 + <ul> <%= render :partial => 'profile', :collection => @enterprises %> </ul>
  26 +</div>
test/functional/search_controller_test.rb
  Diff comments   View file @d3482d9
@@ -759,6 +759,16 @@ class SearchControllerTest &lt; Test::Unit::TestCase @@ -759,6 +759,16 @@ class SearchControllerTest &lt; Test::Unit::TestCase
759 assert_not_includes assigns(:results)[:comments], comment4 759 assert_not_includes assigns(:results)[:comments], comment4
760 end 760 end
761 761
  762 + should 'list all sellers' do
  763 + ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1')
  764 + ent2 = Enterprise.create!(:name => 'test2', :identifier => 'test2')
  765 +
  766 + get :sellers
  767 +
  768 + assert_includes assigns('enterprises'), ent1
  769 + assert_includes assigns('enterprises'), ent2
  770 + end
  771 +
762 should 'find enterprise by product category' do 772 should 'find enterprise by product category' do
763 ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1') 773 ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1')
764 prod_cat = ProductCategory.create!(:name => 'pc-test', :environment => Environment.default) 774 prod_cat = ProductCategory.create!(:name => 'pc-test', :environment => Environment.default)
@@ -766,7 +776,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase @@ -766,7 +776,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
766 776
767 ent2 = Enterprise.create!(:name => 'test2', :identifier => 'test2') 777 ent2 = Enterprise.create!(:name => 'test2', :identifier => 'test2')
768 778
769 - get :sellers, :product_category => ['pc-test'] 779 + get :sellers, :category => prod_cat.id
770 780
771 assert_includes assigns('enterprises'), ent1 781 assert_includes assigns('enterprises'), ent1
772 assert_not_includes assigns('enterprises'), ent2 782 assert_not_includes assigns('enterprises'), ent2