Skip to content
Extraits de code Groupes Projets
Valider 5d87ca09 rédigé par Jamie Wilkinson's avatar Jamie Wilkinson Validation de Diaspora
Parcourir les fichiers

Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting

parent a38655bd
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController
end end
def create def create
begin begin
user = User.instantiate!(params[:user]) user = User.instantiate!(params[:user])
rescue MongoMapper::DocumentNotValid => e rescue MongoMapper::DocumentNotValid => e
user = nil user = nil
...@@ -20,7 +20,7 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -20,7 +20,7 @@ class RegistrationsController < Devise::RegistrationsController
#redirect_to root_url #redirect_to root_url
sign_in_and_redirect(:user, user) sign_in_and_redirect(:user, user)
else else
redirect_to "/get_to_the_choppa" redirect_to new_user_registration_path
end end
end end
......
...@@ -29,15 +29,15 @@ Diaspora::Application.routes.draw do ...@@ -29,15 +29,15 @@ Diaspora::Application.routes.draw do
devise_for :users, :controllers => {:registrations => "registrations"} devise_for :users, :controllers => {:registrations => "registrations"}
match 'login', :to => 'devise/sessions#new', :as => "new_user_session" match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session" match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
match 'get_to_the_choppa', :to => 'registrations#new', :as => "new_user_registration" match 'signup', :to => 'registrations#new', :as => "new_user_registration"
#public routes #public routes
# #
match 'webfinger', :to => 'publics#webfinger' match 'webfinger', :to => 'publics#webfinger'
match 'hcard/users/:id', :to => 'publics#hcard' match 'hcard/users/:id', :to => 'publics#hcard'
match '.well-known/host-meta',:to => 'publics#host_meta' match '.well-known/host-meta',:to => 'publics#host_meta'
match 'receive/users/:id', :to => 'publics#receive' match 'receive/users/:id', :to => 'publics#receive'
match 'log', :to => "dev_utilities#log" match 'log', :to => "dev_utilities#log"
#root #root
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter