Fix routes. Refs #257

This commit is contained in:
Pavel Chipiga 2012-03-12 22:34:42 +02:00
parent 61b8c70f4b
commit cf009c7388
2 changed files with 5 additions and 9 deletions

View File

@ -5,17 +5,12 @@ Rosa::Application.routes.draw do
devise_scope :user do devise_scope :user do
get '/users/auth/:provider' => 'users/omniauth_callbacks#passthru' get '/users/auth/:provider' => 'users/omniauth_callbacks#passthru'
end
devise_for :users, :controllers => {:omniauth_callbacks => 'users/omniauth_callbacks'}, :skip => [:registrations] do
get '/users/cancel' => 'devise/registrations#cancel', :as => 'cancel_user_registration'
post '/users' => 'devise/registrations#create', :as => 'user_registration'
get '/users/sign_up' => 'devise/registrations#new', :as => 'new_user_registration'
delete '/users' => 'devise/registrations#destroy'
get '/user' => 'users#profile', :as => 'edit_profile' get '/user' => 'users#profile', :as => 'edit_profile'
put '/user' => 'users#update', :as => 'update_profile' put '/user' => 'users#update', :as => 'update_profile'
get '/users/:id' => 'users#profile', :as => 'edit_user' get '/users/:id/edit' => 'users#profile', :as => 'edit_user'
put '/users/:id' => 'users#update', :as => 'update_user' put '/users/:id/edit' => 'users#update', :as => 'update_user'
end end
devise_for :users, :controllers => {:omniauth_callbacks => 'users/omniauth_callbacks'}
resources :users do resources :users do
resources :groups, :only => [:new, :create, :index] resources :groups, :only => [:new, :create, :index]

View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120303171802) do ActiveRecord::Schema.define(:version => 20120306212914) do
create_table "activity_feeds", :force => true do |t| create_table "activity_feeds", :force => true do |t|
t.integer "user_id", :null => false t.integer "user_id", :null => false
@ -104,6 +104,7 @@ ActiveRecord::Schema.define(:version => 20120303171802) do
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.decimal "commentable_id", :precision => 50, :scale => 0 t.decimal "commentable_id", :precision => 50, :scale => 0
t.integer "project_id"
end end
create_table "containers", :force => true do |t| create_table "containers", :force => true do |t|