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
config/locales/en.yml
View file

@ -1831,10 +1831,14 @@ en:
go_public:
flash success: "All your edits are now public, and you are now allowed to edit."
make_friend:
heading: "Add %{user} as a friend?"
button: "Add as friend"
success: "%{name} is now your friend."
failed: "Sorry, failed to add %{name} as a friend."
already_a_friend: "You are already friends with %{name}."
remove_friend:
heading: "Remove %{user} as a friend?"
button: "Remove as friend"
success: "%{name} was removed from your friends."
not_a_friend: "%{name} is not one of your friends."
filter:

4
config/routes.rb
View file

@ -174,8 +174,8 @@ OpenStreetMap::Application.routes.draw do
# user pages
match '/user/:display_name' => 'user#view', :via => :get, :as => "user"
match '/user/:display_name/make_friend' => 'user#make_friend', :via => :post
match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :post
match '/user/:display_name/make_friend' => 'user#make_friend', :via => [:get, :post], :as => "make_friend"
match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => [:get, :post], :as => "remove_friend"
match '/user/:display_name/account' => 'user#account', :via => [:get, :post]
match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user
match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user