diff --git a/config/routes.rb b/config/routes.rb index f27134c9..49128d28 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ ActionController::Routing::Routes.draw do |map| - + map.resource :user_session map.resources :password_resets map.resources :attachments, :only => [:show] @@ -31,28 +31,28 @@ :files => :get, :images => :get, }, :new => { :spawn => :get } do |conversation| - conversation.resources :messages, :member => { :report => :post }, - :collection => {:images => :get, :files => :get}, + conversation.resources :messages, :member => { :report => :post }, + :collection => {:images => :get, :files => :get, :upload_attachment => :post}, :except => [:edit, :update, :destroy] conversation.resources :subscribers conversation.resource :subscription end - + # OAuth routes map.resources :oauth_clients map.authorize '/oauth/authorize',:controller=>'oauth',:action=>'authorize' map.request_token '/oauth/request_token',:controller=>'oauth',:action=>'request_token' map.access_token '/oauth/access_token',:controller=>'oauth',:action=>'access_token' map.test_request '/oauth/test_request',:controller=>'oauth',:action=>'test_request' - + map.root :controller => "home" map.login '/login', :controller => 'user_sessions', :action => 'new' map.logout '/logout', :controller => 'user_sessions', :action => 'destroy' map.signup '/signup', :controller => 'users', :action => 'new' map.activate '/activate/:perishable_token', :controller => "users", :action => "activate" map.disable '/disable', :controller => "users", :action => "disable" - + map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' - + end