imagine_cms 3.0.18 → 3.0.19

data/app/controllers/cms/content_controller.rb

@@ -192,9 +192,8 @@ module Cms # :nodoc:
           end
         end
       rescue Exception => e
-        logger.debug "Error rendering from db: #{e.class}: #{e.message}"
-        # log_error(e)
-        return rendering_error(e)
+        logger.error "Error rendering from db: #{e.class}: #{e.message}"
+        rendering_error(e) and return true
       end
       
       # if we haven't rendered something from the db by now, return false

data/app/controllers/management/cms_controller.rb

@@ -913,12 +913,12 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     if request.post?
       unless params[:gallery_id].downcase == "new"
-        redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id] and return
+        redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
       else
-        render :partial => 'upload_image' and return
+        render :partial => 'upload_image'
       end
     else
-      render :partial => 'select_gallery' and return
+      render :partial => 'select_gallery'
     end
   end
   
@@ -1469,8 +1469,11 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     
     def create_preview_image(src_file, dest, force = 0, overlay = 'gallery_small_overlay.png', thumb_size = 90)
+      raise "Source file required" if src_file.blank?
+      
       dest = File.join(dest, File.basename(src_file)) if File.directory?(dest)
       if !File.exists?(dest) || force == 1
+        logger.debug "Reading source file #{src_file}"
         im = Magick::Image::read(src_file)[0]
         im_overlay = Magick::Image::read(File.join(ImagineCms::Engine.root, 'app', 'assets', 'images', 'management', overlay))[0]
         
@@ -1551,7 +1554,7 @@ module MiniMagick
     def crop_resized(ncols, nrows, gravity='Center')
       columns = self[:width].to_i
       rows = self[:height].to_i
-
+      
       if ncols != columns || nrows != rows
         scale = [ncols/columns.to_f, nrows/rows.to_f].max
         resize("#{scale*(columns+0.5).to_i}x#{scale*(rows+0.5).to_i}")

data/app/views/management/cms/_select_gallery.html.erb

@@ -1,7 +1,7 @@
 <div id="delete_gallery_container">
   <div id="select_gallery_container">
   
-  <%- if session[:broken_galleries] and session[:broken_galleries].size > 0 -%>
+  <%- if session[:broken_galleries].is_a?(Array) && session[:broken_galleries].size > 0 -%>
     <div id="broken_galleries" style="margin-bottom: 10px; padding: 10px; background-color: #ffa7b9; border: 2px solid #f03;">
       <p><b>The following galleries have problems and require fixing:</b></p>
       <ul style="padding: 0; margin: 0 0 0 15px; list-style-type: disc;">
@@ -15,7 +15,7 @@
     </div>
   <%- end -%>
   
-  <%- if @galleries.size > 0 -%>
+  <%- if @galleries.is_a?(Array) && @galleries.size > 0 -%>
     <div id="select_gallery">
       <h2>Select gallery</h2>
     <%-

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.18"
+  VERSION = "3.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails