Download as
Browse Code »

Commit 82bfcffc3e0ca2c8368c245755a677d8e68759ed

Authored by MoisesMachado
1 parent 4a81610a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 <div class="search-index"> 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 &nbsp; 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 </div> 5 </div>
6 <br style='clear:both'/> 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,6 +519,12 @@ class SearchControllerTest &lt; Test::Unit::TestCase
519 assert_tag :tag => 'a', :attributes => { :href => '/assets/people' }, :content => 'Recent' 519 assert_tag :tag => 'a', :attributes => { :href => '/assets/people' }, :content => 'Recent'
520 end 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 ############### directory for every kind of asset ################# 528 ############### directory for every kind of asset #################
523 should 'display people with a given initial' do 529 should 'display people with a given initial' do
524 included = create_user('fergunson').person 530 included = create_user('fergunson').person