fix for both part and page part settings
Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb
This commit is contained in:
1 parent
f6b600df59
commit
0f6f5aafce
17 files changed
+185
-88
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
defaults: &defaults
|
||||
host: localhost
|
||||
host: 192.168.1.105
|
||||
# slaves:
|
||||
# - host: slave1.local
|
||||
port: 27017
|
||||
|
||||
+2
-4
@@ -82,15 +82,13 @@ Orbit::Application.routes.draw do
|
||||
|
||||
resources :pages do
|
||||
collection do
|
||||
get 'reload_themes'
|
||||
get 'reload_after_module_changed', :action=>'reload_frontend_pages'
|
||||
get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
|
||||
get 'reload_after_widget_field_changed',:action=> 'reload_widget_field'
|
||||
end
|
||||
member do
|
||||
get 'delete'
|
||||
get 'reload_themes'
|
||||
get 'reload_after_module_changed',:action=>'reload_frontend_pages'
|
||||
get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
|
||||
get 'reload_after_widget_field_changed',:action=> 'reload_widget_field'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user