active_scaffold_batch 3.3.1 → 3.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yzg5MDMwN2IxZGQ5NjRjMzZkOGY0NzdmODYxNjYyNWEwOWQwM2FmMg==
+  data.tar.gz: !binary |-
+    OTE1M2JmNTlhMmZmNDg3MDNjOWQ2Yzc5MWI1ZjgwZGY0NWE4MWIxOA==
+SHA512:
+  metadata.gz: !binary |-
+    ZDEzNDUzYTk5ZWIxMWQxNDU5OTFhN2RmM2UzOTJiNzgyNTNkNTllYTdlNGU2
+    ODg3NzA4NTA3OTY4M2JlNjkxNjVmMWNlMmQ3ZDVmMTQ3YmI3YzMzMWEzNmQz
+    OTJiOWU4N2Y3YzM0OThmYWRjN2Q4OWI3NjBlMDVjMDNmZmQ4ZDQ=
+  data.tar.gz: !binary |-
+    MTk1YjRkMTBjMTU0YTU1OTgyNjEzNDY4NmNkNGEzYzU3YjMwZDk4OGNjYmUw
+    MjJkOWIzZWQyZjkzOGRkMDcxNTI1MjliYzUxMDFhMzllYTBhOGEzMmU2N2U4
+    NDJjN2JjMGFmNjMwNWFmY2VlMGQxZDJmNDY4NmI5YWM2NWU5YTg=

data/app/views/active_scaffold_overrides/_form_messages.html.erb

@@ -1,8 +1,10 @@
 <% if @error_records.present? && @error_records.is_a?(Array) -%>
   <%= render :partial => 'messages' unless request.xhr? %>
 
+  <% id_column = active_scaffold_config.model.human_attribute_name(batch_create_by_column) if batch_create_by_column && active_scaffold_config.columns[batch_create_by_column].association.nil? %>
   <% @error_records.each do |record| %>
-    <%= active_scaffold_error_messages_for record, :object_name => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}" %>
+    <% record_title = record.new_record? ? (id_column ? "(#{id_column} #{record.send(batch_create_by_column)})" : '') : record.to_label %>
+    <%= active_scaffold_error_messages_for record, :object_name => "#{record.class.model_name.human.downcase} #{record_title}" %>
   <% end %>
 <% else %>
   <%= render :super %>

data/lib/active_scaffold/actions/batch_create.rb

@@ -101,7 +101,7 @@ module ActiveScaffold::Actions
       if @marked_records_parent.nil?
         @marked_records_parent = if params[:batch_create_by]
           session_parent = active_scaffold_session_storage(params[:batch_create_by])
-          session_parent[:marked_records] || {}
+          session_parent['marked_records'] || {}
         else
           false
         end
@@ -198,6 +198,8 @@ module ActiveScaffold::Actions
         end
         if successful?
           marked_records_parent.delete(created_by.id.to_s) if batch_scope == 'MARKED' && marked_records_parent
+        elsif @record.errors[batch_create_by_column]
+          @record.errors.messages[batch_create_by_column].map!{|e| "#{@record.send(batch_create_by_column)} #{e}"}
         end
         error_records << @record unless successful? && !run_in_transaction?
       end
@@ -224,10 +226,10 @@ module ActiveScaffold::Actions
       if column.association
         column_plural_assocation_value_from_value(column, value)
       else
-        value.split
+        value.lines.map(&:chomp)
       end
     end
-    
+
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def batch_create_authorized?(record = nil)

data/lib/active_scaffold/actions/batch_destroy.rb

@@ -49,7 +49,7 @@ module ActiveScaffold::Actions
       @successful = nil
       @record = record
 
-      do_destroy
+      do_destroy(record)
       if successful?
         @record.as_marked = false if batch_scope == 'MARKED'
       else

data/lib/active_scaffold_batch/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldBatch
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,48 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_scaffold_batch
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 3
-  - 3
-  - 1
-  version: 3.3.1
+version: !ruby/object:Gem::Version
+  version: 3.3.2
 platform: ruby
-authors: 
+authors:
 - Sergio Cambra
 - Volker Hochstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-09-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 3
-        - 0
-        version: 3.3.0
-  version_requirements: *id001
+date: 2015-11-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: active_scaffold
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.18
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.18
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README
+files:
+- LICENSE.txt
 - README
-files: 
 - app/assets/javascripts/jquery/active_scaffold_batch.js
 - app/assets/javascripts/prototype/active_scaffold_batch.js
 - app/assets/stylesshets/active_scaffold_batch.css
@@ -85,40 +76,28 @@ files:
 - lib/active_scaffold_batch/config/core.rb
 - lib/active_scaffold_batch/engine.rb
 - lib/active_scaffold_batch/version.rb
-- LICENSE.txt
-- README
 homepage: http://github.com/scambra/active_scaffold_batch
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Batch Processing for ActiveScaffold
 test_files: []
-