Download as
Browse Code »

Commit 82bfcffc3e0ca2c8368c245755a677d8e68759ed

Authored by MoisesMachado
1 parent 4a81610a
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

ActionItem495: fixed 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2093 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
app/views/search/_directory.rhtml
  Diff comments   View file @82bfcff
1 1 <div class="search-index">
2   - <%= link_to_unless(params[:initial].blank?, _('Recent'), :action => 'assets', :display => params[:display]) %>
  2 + <%= link_to_unless(params[:initial].blank?, _('Recent'), params.merge(:action => 'assets', :initial => nil)) %>
3 3 &nbsp;
4   - <%= (?a..?z).map { |initial| link_to_unless(params[:initial] == ('' << initial), ('' << initial).upcase, :action => 'directory', :asset => @asset, :initial => ('' << initial), :display => params[:display]) }.join(' &nbsp; ') %>
  4 + <%= ('a'..'z').map { |initial| link_to_unless(params[:initial] == initial, initial.upcase, params.merge(:action => 'directory', :asset => @asset, :initial => initial)) }.join(' &nbsp; ') %>
5 5 </div>
6 6 <br style='clear:both'/>
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @82bfcff
... ... @@ -519,6 +519,12 @@ class SearchControllerTest &lt; Test::Unit::TestCase
519 519 assert_tag :tag => 'a', :attributes => { :href => '/assets/people' }, :content => 'Recent'
520 520 end
521 521  
  522 + should 'not leave category in link to other char in directory' do
  523 + cat = Category.create!(:name => 'just_a_category', :environment => Environment.default)
  524 + get :directory, :asset => 'people', :initial => 'r', :category_path => cat.path.split('/')
  525 + assert_tag :tag => 'a', :attributes => { :href => "/directory/people/k/#{cat.path}" }
  526 + end
  527 +
522 528 ############### directory for every kind of asset #################
523 529 should 'display people with a given initial' do
524 530 included = create_user('fergunson').person
... ...