papermill 1.0.7 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.1.0

data/app/controllers/papermill_controller.rb

@@ -30,7 +30,7 @@ class PapermillController < ApplicationController
       if @asset.update_attributes(params[:papermill_asset])
         page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice"); close_popup(self);  }
       else
-        page << %{ jQuery("#error").html("#{ escape_javascript @asset.errors.full_messages.join('<br>') }"); jQuery("#error").show(); }
+        page << %{ jQuery("#error").html("#{ escape_javascript @asset.errors.full_messages.join('<br />') }"); jQuery("#error").show(); }
       end
     end
   end
@@ -48,7 +48,7 @@ class PapermillController < ApplicationController
       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.join('<br />')) }", "warning"); }
+        page << %{ notify("#{ escape_javascript(@asset.errors.to_sentence) }", "warning"); }
       end
     end
   end
@@ -69,18 +69,9 @@ class PapermillController < ApplicationController
   end
   
   def mass_edit
-    ok_messages = []
-    ko_messages = []
-    @assets.each do |asset|
-      if asset.update_attributes({params[:attribute] => params[:value]})
-        ok_messages << t("papermill.updated", :ressource => asset.name) 
-      else
-        ko_messages << "#{asset.name} -> #{asset.errors.full_messages.to_sentence}"
-      end
-    end
+    @assets.each { |asset| asset.update_attribute(params[:attribute], params[:value]) }
     render :update do |page|
-      page << %{ notify("#{ escape_javascript ok_messages.join('\n') }", "notice"); } unless ok_messages.empty?
-      page << %{ notify("#{ escape_javascript ko_messages.join('\n') }", "error"); } unless ko_messages.empty?
+      page << %{ notify("#{ escape_javascript  t("papermill.updated", :ressource => @assets.map(&:name).to_sentence)  }", "notice"); } unless @assets.blank? 
     end
   end
   

data/config/locales/papermill.yml

@@ -33,7 +33,7 @@ en:
 fr:
   papermill:
     not-processed: "Erreur/ressource non trouvée"
-    updated: "{{ressource}} mis(e) à jour"
+    updated: "{{ressource}} modifiés(s)"
     not-deleted: "{{ressource}} n'a pas pu être supprimée"
     not-found: "Asset #{{ressource}} non trouvé"
     edit-title: "Cliquer pour éditer '{{ressource}}'"

data/lib/papermill/form_builder.rb

@@ -41,7 +41,7 @@ module ActionView::Helpers::FormTagHelper
     end
  
     assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
-    options = PapermillAsset.assetable_papermill_options(assetable.class.name, key).deep_merge(options)
+    options = PapermillAsset.assetable_papermill_options(assetable && assetable.class.name, key).deep_merge(options)
     
     assetable_id = assetable && (assetable.id || assetable.timestamp) || nil
     assetable_type = assetable && assetable.class.base_class.name || nil
@@ -104,7 +104,7 @@ module ActionView::Helpers::FormTagHelper
     
     conditions = {:assetable_type => assetable_type, :assetable_id => assetable_id}
     conditions.merge!({:assetable_key => key.to_s}) if key
-    collection = PapermillAsset.all(:conditions => conditions, :order => "position")
+    collection = PapermillAsset.all(:conditions => conditions)
     
     html[:upload_button] = %{<div id="#{id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
     html[:container] = @template.content_tag(:div, :id => id, :class => "#{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {

data/lib/papermill/papermill_asset.rb

@@ -71,7 +71,7 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def self.assetable_papermill_options(assetable_class, assetable_key)
-    if assetable_class 
+    if assetable_class
       assoc = assetable_class.constantize.papermill_associations
       assoc[assetable_key.try(:to_sym)] || assoc[Papermill::options[:base_association_name]]
     else
@@ -100,7 +100,7 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def set_position
-    self.position ||= PapermillAsset.first(:conditions => { :assetable_key => assetable_key, :assetable_type => assetable_type, :assetable_id => assetable_id } ).try(:position).to_i + 1
+    self.position ||= PapermillAsset.last(:conditions => { :assetable_key => assetable_key, :assetable_type => assetable_type, :assetable_id => assetable_id } ).try(:position).to_i + 1
   end
   
   def destroy_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper