cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup make_friend and remove_friend properly

Browse source 
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
This commit is contained in:
Tom Hughes 2012-08-15 19:48:06 +01:00
parent a8396f8871
commit 573991e5a9
8 changed files with 73 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/user/_contact.html.erb
View file

@ -33,9 +33,9 @@
<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
|
<% if @user.is_friends_with?(contact) %>
<%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.fullpath, :method => :post %>
<%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% else %>
<%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.fullpath, :method => :post %>
<%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% end %>
</td>
</tr>

7
app/views/user/make_friend.html.erb Normal file
View file

@ -0,0 +1,7 @@
<h1><%= t "user.make_friend.heading", :user => @new_friend.display_name %></h1>
<%= form_tag do %>
<% if params[:referer] -%>
<%= hidden_field_tag("referer", params[:referer]) %>
<% end -%>
<%= submit_tag t("user.make_friend.button") %>
<% end %>

7
app/views/user/remove_friend.html.erb Normal file
View file

@ -0,0 +1,7 @@
<h1><%= t "user.remove_friend.heading", :user => @friend.display_name %></h1>
<%= form_tag do %>
<% if params[:referer] -%>
<%= hidden_field_tag("referer", params[:referer]) %>
<% end -%>
<%= submit_tag t("user.remove_friend.button") %>
<% end %>

4
app/views/user/view.html.erb
View file

@ -41,9 +41,9 @@
<%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
|
<% if @user and @user.is_friends_with?(@this_user) %>
<%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name, :method => :post %>
<%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %>
<% else %>
<%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name, :method => :post %>
<%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %>
<% end %>
<% if @this_user.blocks.exists? %>
|