Download as
Browse Code »

Commit aceb3bee58fd3a5fe178b38b66bcff320aa709d6

Authored by Daniela Feitosa
1 parent 31c76943
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

ActionItem773: adding button to find peoople in "manage/friends/contacts"

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
app/views/friends/index.rhtml
  Diff comments   View file @aceb3be
@@ -22,13 +22,14 @@ @@ -22,13 +22,14 @@
22 <p> 22 <p>
23 <em> 23 <em>
24 <%= __('You have no friends yet.') %> 24 <%= __('You have no friends yet.') %>
25 - <%= link_to _('Want you see other persons on this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %> 25 + <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
26 </em> 26 </em>
27 </p> 27 </p>
28 <% end %> 28 <% end %>
29 29
30 <% button_bar do %> 30 <% button_bar do %>
31 <%= button(:back, _('Go back'), :controller => 'profile_editor') %> 31 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
  32 + <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
32 <% end %> 33 <% end %>
33 34
34 </div><!-- end id="manage_friends" --> 35 </div><!-- end id="manage_friends" -->
test/functional/friends_controller_test.rb
  Diff comments   View file @aceb3be
@@ -69,4 +69,8 @@ class FriendsControllerTest &lt; Test::Unit::TestCase @@ -69,4 +69,8 @@ class FriendsControllerTest &lt; Test::Unit::TestCase
69 end 69 end
70 end 70 end
71 71
  72 + should 'display find people button' do
  73 + get :index, :profile => 'testuser'
  74 + assert_tag :tag => 'a', :content => 'Find people', :attributes => { :href => '/assets/people' }
  75 + end
72 end 76 end