Download as
Browse Code »

Commit aceb3bee58fd3a5fe178b38b66bcff320aa709d6

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

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 22 <p>
23 23 <em>
24 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 26 </em>
27 27 </p>
28 28 <% end %>
29 29  
30 30 <% button_bar do %>
31 31 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
  32 + <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
32 33 <% end %>
33 34  
34 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 69 end
70 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 76 end
... ...