vendor/plugins/images/app/controllers/admin/images_controller.rb in refinerycms-0.9.6.14 vs vendor/plugins/images/app/controllers/admin/images_controller.rb in refinerycms-0.9.6.15
- old
+ new
@@ -77,11 +77,11 @@
end
protected
def init_dialog
- @thickbox = params[:thickbox].present?
+ @app_dialog = params[:app_dialog].present?
@field = params[:field]
@update_image = params[:update_image]
@thumbnail = params[:thumbnail]
@callback = params[:callback]
@conditions = params[:conditions]
@@ -90,9 +90,9 @@
def paginate_images(conditions={})
@images = Image.paginate :page => (@paginate_page_number ||= params[:page]),
:conditions => {:parent_id => nil}.merge!(conditions),
:order => 'created_at DESC',
:per_page => Image.per_page(from_dialog?),
- :include => :thumbnails
+ :include => :thumbnails
end
end