developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate Harry's modifications to reload pop-up content

Browse Source
This commit is contained in:
chris2tof committed 2011-12-29 14:09:06 +08:00
1 parent b002c411ce
commit ea19f11fe2
5 files changed
+84 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/assets_controller.rb
+2 -2
View File
@@ -38,7 +38,7 @@ class Admin::AssetsController < ApplicationController
else
respond_to do |format|
format.html { render :action => :new }
format.js { render 'js/reload_content', :locals => {:function => 'html', :id => 'pop_up_content', :value => @asset, :values => nil, :partial => 'admin/assets/new', :locals => {:is_html => false}} }
format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/new', :locals => {:is_html => false}} }
end
end
end
@@ -53,7 +53,7 @@ class Admin::AssetsController < ApplicationController
else
respond_to do |format|
format.html { render :action => :edit }
format.js { render 'js/reload_content', :locals => {:function => 'html', :id => 'pop_up_content', :value => @asset, :values => nil, :partial => 'admin/assets/edit', :locals => {:is_html => false}} }
format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/edit', :locals => {:is_html => false}} }
end
end