app/controllers/papermill_controller.rb in papermill-1.1.2 vs app/controllers/papermill_controller.rb in papermill-1.1.3

@@ -1,53 +1,48 @@
 class PapermillController < ApplicationController
-  prepend_before_filter :load_asset, :only => [ "show", "destroy", "update", "edit" ]
+  prepend_before_filter :load_asset, :only => [ "show", "destroy", "update", "edit", "crop" ]
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit" ]
   
   def show
     if @asset.create_thumb_file(params[:style])
       redirect_to @asset.url(params[:style])
     else
-      render :nothing => true, :status => 404
+      render :nothing => true, :status => 500
     end
   end
 
-  def destroy
-    render :update do |page|
-      if @asset.destroy
-        page << %{ jQuery("#papermill_asset_#{params[:id]}").remove(); }
-      else
-        page << %{ jQuery("#papermill_asset_#{params[:id]}").show(); }
-        page << %{ notify("#{ escape_javascript t('papermill.not-deleted', :ressource => @asset.name) }", "error"); }
-      end
+  def create
+    @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
+    if @asset.save
+      PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
+        asset.destroy unless asset == @asset
+      end if !params[:gallery]
+      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style] }
     end
   end
   
+  def edit
+    render :action => "edit"
+  end
+  
+  def crop
+  end
+  
   def update
     render :update do |page|
       if @asset.update_attributes(params[:papermill_asset])
-        page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice"); close_popup(self);  }
+        page << %{ notify("#{@asset.name}", "#{ escape_javascript t("papermill.updated", :resource => @asset.name)}", "notice"); close_popup(self);  }
       else
         page << %{ jQuery("#error").html("#{ escape_javascript @asset.errors.full_messages.join('<br />') }"); jQuery("#error").show(); }
       end
     end
   end
-  
-  def edit
-    render :action => "edit"
-  end
-  
-  def create
-    @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
-    if @asset.save
-      PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
-        asset.destroy unless asset == @asset
-      end if !params[:gallery]
-      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style] }
-    else
-      render :update do |page|
-        page << %{ notify("#{ escape_javascript(@asset.errors.to_sentence) }", "warning"); }
-      end
+
+  def destroy
+    @asset.destroy
+    render :update do |page|
+      page << %{ jQuery("#papermill_asset_#{params[:id]}").remove(); }
     end
   end
   
   def sort
     @assets.each_with_index do |asset, index|
@@ -65,10 +60,10 @@
   end
   
   def mass_edit
     @assets.each { |asset| asset.update_attribute(params[:attribute], params[:value]) }
     render :update do |page|
-      page << %{ notify("#{ escape_javascript  t("papermill.updated", :ressource => @assets.map(&:name).to_sentence)  }", "notice"); } unless @assets.blank? 
+      page << %{ notify("", "#{ escape_javascript  t("papermill.updated", :resource => @assets.map(&:name).to_sentence)  }", "notice"); } unless @assets.blank? 
     end
   end
   
   private
   def load_asset
\ No newline at end of file