app/controllers/management/cms_controller.rb in imagine_cms-3.0.0.beta10 vs app/controllers/management/cms_controller.rb in imagine_cms-3.0.0.beta11

@@ -28,19 +28,19 @@
   
   cache_sweeper :cms_content_sweeper
   
   def check_permissions
     if !user_has_permission?(:manage_cms)
-      render '/errors/permission_denied'
+      render '/imagine_cms/errors/permission_denied'
       return false
     end
   end
   
   def block_basic_users
     return true unless UseCmsAccessLevels
     unless user_has_permission?(:manage_cms_full_access) && @user.cms_allowed_sections.to_s.strip.blank?
-      render '/errors/permission_denied'
+      render '/imagine_cms/errors/permission_denied'
       return false
     end
   end
   
   def validate_user_access
@@ -306,11 +306,11 @@
         end
         
         render :update do |page|
           case params[:return_to]
           when 'preview'
-            page.redirect_to "/#{@pg.path}"
+            page.redirect_to "/#{@pg.path}/version/#{@pg.published_version > 0 ? @pg.published_version : @pg.version}"
           else
             flash[:notice] = 'Page saved.'
             session[:cms_pages_path] = @pg.path
             page.redirect_to :action => 'pages'
           end
@@ -812,12 +812,10 @@
     
     render :partial => 'crop_results'
   end
   
   def receive_gallery
-    require 'zip/zip'
-    
     @pg = CmsPage.find_by_id(params[:id])
     begin
       data = params[:gallery_file][:data]
       target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
       localdir = File.join(target_dir, 'gallery_1')
@@ -1149,12 +1147,10 @@
       File.chmod(0644, localfile, thumbfile)
       
       create_preview_images(:force => 1)
       
     elsif ext == '.zip'
-      require 'zip/zip'
-      
       begin
         Zip::ZipFile.foreach(data.path) do |zipentry|
           next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
           upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
           localfile = File.join(temp_location, ((last_id+1).to_s + File.extname(zipentry.name)).downcase)
@@ -1331,10 +1327,11 @@
     localfile = File.basename(params[:filename])
     
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile
+      upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_thumb' and return
     end
     
     
     # if we're still here... let's crop!
@@ -1397,10 +1394,11 @@
     orig_im.write(localfile) if dirty
     File.chmod(0644, localfile)
     
     @image_file = localfile
     File.unlink testfile
+    upload_to_s3(localfile, @pg)
     
     render :partial => 'crop_results_thumb'
   end
   
   def upload_feature_image
@@ -1413,10 +1411,11 @@
     localfile = File.basename(params[:filename])
     
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile
+      upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_feature_image' and return
     end
     
     
     # if we're still here... let's crop!
@@ -1479,10 +1478,11 @@
     orig_im.write(localfile) if dirty
     File.chmod(0644, localfile)
     
     @image_file = localfile
     File.unlink testfile
+    upload_to_s3(localfile, @pg)
     
     render :partial => 'crop_results_feature_image'
   end
   
   
@@ -1651,10 +1651,9 @@
     end
     
     def upload_to_s3(filename, page)
       s3retries = 0
       s3success = false
-      
       
       if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
         filename = File.join(Rails.root, 'public', 'assets', 'content', page.path, File.basename(filename))
         prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']
         bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']