Download as
Browse Code »

Commit a162ccff02711813a78768d01dfc89c79024a103

Authored by Rodrigo Souto
1 parent b2a0c431
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

Fixing html_safe and only starting server on tests run

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @a162ccf
@@ -95,7 +95,7 @@ module SearchHelper @@ -95,7 +95,7 @@ module SearchHelper
95 map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil 95 map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
96 full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil 96 full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
97 content_tag('div', 97 content_tag('div',
98 - content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | '), 98 + content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
99 :class => 'search-customize-options' 99 :class => 'search-customize-options'
100 ) 100 )
101 end 101 end
plugins/solr/test/test_solr_helper.rb
  Diff comments   View file @a162ccf
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # FIXME Not working properly... 2 # FIXME Not working properly...
3 if not $test_helper_loaded 3 if not $test_helper_loaded
4 abort unless system 'rake -s solr:start' 4 abort unless system 'rake -s solr:start'
5 - at_exit { system 'rake -s solr:stop' } 5 +# at_exit { system 'rake -s solr:stop' }
6 $test_helper_loaded = true 6 $test_helper_loaded = true
7 end 7 end
8 8