Download as
Browse Code »

Commit 326a7bd6c5011bb65cb90c7f1b8bf8ba70408bfb

Authored by Antonio Terceiro
2 parents 30b2a8e5 1e0c8ccd
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

Merge commit 'refs/merge-requests/200' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/200
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/friends/index.rhtml
  Diff comments   View file @326a7bd
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 :class => 'button icon-remove', 31 :class => 'button icon-remove',
32 :title => _('remove') %> 32 :title => _('remove') %>
33 <%= link_to content_tag('span',_('contact')), 33 <%= link_to content_tag('span',_('contact')),
34 - friend.url.merge(:controller => 'contact', :action => 'new'), 34 + friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
35 :class => 'button icon-menu-mail', 35 :class => 'button icon-menu-mail',
36 :title => _('contact') %> 36 :title => _('contact') %>
37 </div><!-- end class="controll" --> 37 </div><!-- end class="controll" -->
app/views/search/communities.rhtml
  Diff comments   View file @326a7bd
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <% if logged_in? %> 4 <% if logged_in? %>
5 <% button_bar do %> 5 <% button_bar do %>
6 <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %> 6 <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
7 - <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %> 7 + <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
8 <% end %> 8 <% end %>
9 <% end %> 9 <% end %>
10 10