Merge branch 'obj_auth' into announcement_dev_view_and_auth

This commit is contained in:
Matthew Kaito Juyuan Fu committed 2012-02-12 23:24:50 +08:00
commit c88e1c8419
15 files changed
+342 -123

No files matched your search

+10
View File
@@ -12,6 +12,16 @@ PrototypeR4::Application.routes.draw do
namespace :admin do
resources :assets
resources :app_auths
resources :object_auths do
collection do
match 'new/:type/:obj_id',:action => 'new',:via => "get",:as => :init
end
member do
match ':id/create_role',:action => 'create_role',:via => "post",:as => :create_role
match 'remove/:type/:target_id' ,:action=> 'remove_role',:via => "delete",:as =>:remove
end
end
resources :ad_banners
resources :designs do
collection do