Updated ADBanner with fixes on index page, ADImage with fixes
Conflicts: app/views/admin/ad_banners/index.html.erb app/views/admin/ad_images/_form.html.erb vendor/built_in_modules/ad_banner/init.rb
This commit is contained in:
1 parent
a5c800d3fe
commit
a2e9aa2e0b
14 files changed
+414
-157
No files matched your search
+1
-1
@@ -50,7 +50,7 @@ Orbit::Application.routes.draw do
|
||||
match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
|
||||
match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
|
||||
end
|
||||
resources :ad_images ,:except => [:show,:index]
|
||||
resources :ad_images ,:except => [:show]
|
||||
end
|
||||
|
||||
match 'authorizations/add_roles/:module(/:type(/:id))' => 'authorizations#add_roles', :as => :add_roles_authorizations
|
||||
|
||||
Reference in new issue
Block a user