Download as
Browse Code »

Commit 7c35802b3ecf04ab2b8f7870511e0e7c1ba166cf

Authored by Daniela Feitosa
1 parent 08a13702
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Changed search options names 

(ActionItem1734)
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/views/shared/_profile_search_form.rhtml
  Diff comments   View file @7c35802
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 </span> 5 </span>
6 <%= submit_button(:search, _('Search')) %> 6 <%= submit_button(:search, _('Search')) %>
7 <div> 7 <div>
8 - <%= labelled_radio_button __('Profile'), 'where', 'profile', true %>  
9 - <%= labelled_radio_button environment.name, 'where', 'environment', false %> 8 + <%= labelled_radio_button profile.short_name, 'where', 'profile', true, :title => _("Find in %s's content") % profile.short_name %>
  9 + <%= labelled_radio_button _('General'), 'where', 'environment', false, :title => _("Search all content") %>
10 </div> 10 </div>
11 </div> 11 </div>
12 <% end %> 12 <% end %>
features/profile_search.feature
  Diff comments   View file @7c35802
@@ -53,7 +53,7 @@ Feature: search inside a profile @@ -53,7 +53,7 @@ Feature: search inside a profile
53 Scenario: search on environment 53 Scenario: search on environment
54 Given I go to Joao Silva's profile 54 Given I go to Joao Silva's profile
55 And I fill in "q" with "bees" 55 And I fill in "q" with "bees"
56 - And I choose "Colivre.net" 56 + And I choose "General"
57 And I press "Search" 57 And I press "Search"
58 Then I should be on the search page 58 Then I should be on the search page
59 And I should see "bees and butterflies" within "#search-page" 59 And I should see "bees and butterflies" within "#search-page"