From 5dadd028d769016a5bf3e983044380d2f1937248 Mon Sep 17 00:00:00 2001 From: masche842 Date: Thu, 8 Mar 2012 15:09:09 +0800 Subject: [PATCH] fixes path-issues due to missing format --- app/controllers/alchemy/admin/essence_pictures_controller.rb | 1 + app/views/alchemy/admin/essence_pictures/crop.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/alchemy/admin/essence_pictures_controller.rb b/app/controllers/alchemy/admin/essence_pictures_controller.rb index 25153ab23c..af9156b032 100644 --- a/app/controllers/alchemy/admin/essence_pictures_controller.rb +++ b/app/controllers/alchemy/admin/essence_pictures_controller.rb @@ -16,6 +16,7 @@ def crop if @essence_picture.picture @content = @essence_picture.content @options = params[:options] || {} + @options[:format] ||= (configuration(:image_store_format) or 'png') if @essence_picture.render_size.blank? if @options[:image_size].blank? @size_x, @size_y = 0, 0 diff --git a/app/views/alchemy/admin/essence_pictures/crop.html.erb b/app/views/alchemy/admin/essence_pictures/crop.html.erb index 3395d0bc3a..099df5dfff 100644 --- a/app/views/alchemy/admin/essence_pictures/crop.html.erb +++ b/app/views/alchemy/admin/essence_pictures/crop.html.erb @@ -31,7 +31,7 @@
<%= image_tag( - alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname), + alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format] ), :id => 'imageToCrop', :onload => "Alchemy.ImageCropper.init( [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],