active_scaffold_batch 3.2.2 → 3.3.0

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

@@ -1,13 +1,13 @@
 <% scope ||= nil %>
 <dl>
   <dt>
-    <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
+    <label for="<%= (options = active_scaffold_input_options(column, scope, :object => record))[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
     <% if column == batch_create_by_column.to_sym %>
-      <%= active_scaffold_batch_create_by_column column, scope %>
+      <%= active_scaffold_batch_create_by_column column, scope, :object => record %>
     <% else %>
-      <%= active_scaffold_input_for column, scope %>
+      <%= active_scaffold_input_for column, scope, options %>
       <% if column.update_columns -%>
         <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
       <% end -%>

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

@@ -18,8 +18,8 @@
   <% else
     renders_as = :field if renders_as == :subform -%>
   <li class="form-element <%= column.css_class unless column.css_class.nil? %>">
-    <%= render :partial => 'batch_create_form_attribute', :locals => { :column => column } -%>
+    <%= render :partial => 'batch_create_form_attribute', :locals => { :column => column, :record => @record } -%>
   </li>
   <% end -%>
   <% end -%>
-</ol>
+</ol>

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

@@ -1,12 +1,11 @@
 <div class="form sub-form horizontal-sub-form">
 <table cellpadding="0" cellspacing="0">
-  <% @record = records.first -%>
-  <%= render :partial => 'batch_create_form_horizontal_header', :locals => {:columns => columns, :record => @record} %>
+  <%= render :partial => 'batch_create_form_horizontal_header', :locals => {:columns => columns, :record => records.first} %>
 
   <tbody id="<%= element_form_id :action => form_action %>-content" class="multiple">
     <% first = true -%>
-    <% records.each do |scope, @record| %>
-    <%= render :partial => 'batch_create_form_horizontal_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first } %>
+    <% records.each do |scope, record| %>
+    <%= render :partial => 'batch_create_form_horizontal_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first, :record => record } %>
     <% first = false -%>
     <% end -%>
   </tbody>

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

@@ -1,8 +1,8 @@
 <% first = true unless local_assigns.has_key? :first -%>
-<% if @record.errors.count -%>
+<% if record.errors.count -%>
 <tr class="form_record-errors">
-  <td colspan="<%= columns.length + 1 %>" id="<%= element_messages_id :action => @record.class.name.underscore %>">
-    <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+  <td colspan="<%= columns.length + 1 %>" id="<%= element_messages_id :action => record.class.name.underscore %>">
+    <%= active_scaffold_error_messages_for :record, :object_name => record.class.model_name.human.downcase %>
   </td>
 </tr>
 <% end %>
@@ -10,7 +10,7 @@
 <% columns.each :flatten => true do |column| -%>
 <%
   next if column_renders_as(column) == :hidden
-  next unless @record.authorized_for?(:crud_type => :create, :column => column.name) 
+  next unless record.authorized_for?(:crud_type => :create, :column => column.name) 
   column = column.clone
   column.form_ui ||= :select if column.association
   
@@ -19,7 +19,7 @@
   col_class << column.css_class unless column.css_class.nil?
 -%>
   <td class="<%= col_class.join(' ') %>">
-    <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
+    <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope, :record => record } -%>
   </td>
 <% end -%>
   <td><%= batch_create_multiple_remove_link unless first %></td>

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

@@ -1,7 +1,7 @@
 <div id="<%= element_form_id :action => form_action %>-content" class="multiple">
 <% first = true -%>
-<% records.each do |scope, @record| -%>
-  <%= render :partial => 'batch_create_form_vertical_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first } %>
+<% records.each do |scope, record| -%>
+  <%= render :partial => 'batch_create_form_vertical_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first, :record => record } %>
   <% first = false -%>
 <% end -%>
 </div>

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

@@ -4,9 +4,9 @@
     <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
-    <%= active_scaffold_update_for column, scope %>
+    <%= active_scaffold_update_for column, scope, :object => record %>
     <% if column.description -%>
       <span class="description"><%= column.description %></span>
     <% end -%>
   </dd>
-</dl>
+</dl>

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

@@ -10,15 +10,15 @@
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section">
     <h5><%= column.label %></h5>
-    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id} %>
-    <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
+    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id } %>
+    <%= link_to_visibility_toggle(subsection_id, :default_visible => !column.collapsed) -%>
   </li>
   <% elsif column.readonly_association?
     next %>
   <% else
     renders_as = :field if renders_as == :subform -%>
   <li class="form-element <%= column.css_class unless column.css_class.nil? %>">
-    <%= render :partial => 'batch_update_form_attribute', :locals => { :column => column } -%>
+    <%= render :partial => 'batch_update_form_attribute', :locals => { :column => column, :record => @record } -%>
   </li>
   <% end -%>
   <% end -%>

data/app/views/active_scaffold_overrides/batch_add.js.erb

@@ -1,5 +1,5 @@
 <% html = ''.html_safe -%>
-<% @records.each do |scope, @record| -%>
-<% html << render(:partial => "#{batch_create_multiple_layout}_record", :locals => { :columns => active_scaffold_config.batch_create.columns, :form_action => :batch_create, :scope => "[#{scope}]", :first => false }) %>
+<% @records.each do |scope, record| -%>
+<% html << render(:partial => "#{batch_create_multiple_layout}_record", :locals => { :columns => active_scaffold_config.batch_create.columns, :form_action => :batch_create, :scope => "[#{scope}]", :first => false, :record => record }) %>
 <% end %>
 ActiveScaffold.create_associated_record_form('<%= element_form_id(:action => :batch_create) %>-content','<%= escape_javascript(html) %>', <%= {:singular => false}.to_json.html_safe %>);

data/lib/active_scaffold/actions/batch_base.rb

@@ -57,7 +57,7 @@ module ActiveScaffold::Actions
 
     def process_batch
       send("before_do_#{action_name}")
-      send("#{action_name}_#{batch_scope.downcase}") if !batch_scope.nil? && respond_to?("#{action_name}_#{batch_scope.downcase}")
+      send("#{action_name}_#{batch_scope.downcase}") if !batch_scope.nil? && respond_to?("#{action_name}_#{batch_scope.downcase}", true)
       prepare_error_record unless batch_successful?
     end
 
@@ -76,7 +76,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_respond_to_html
-      if respond_to? "#{action_name}_respond_to_html"
+      if respond_to? "#{action_name}_respond_to_html", true
         send("#{action_name}_respond_to_html")
       else
         if params[:iframe]=='true' # was this an iframe post ?
@@ -92,7 +92,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_respond_to_js
-      if respond_to? "#{action_name}_respond_to_js"
+      if respond_to? "#{action_name}_respond_to_js", true
         send("#{action_name}_respond_to_js")
       else  
         do_refresh_list
@@ -101,7 +101,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_respond_to_xml
-      if respond_to? "#{action_name}_respond_to_xml"
+      if respond_to? "#{action_name}_respond_to_xml", true
         send("#{action_name}_respond_to_xml")
       else
         render :xml => response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.names), :content_type => Mime::XML, :status => response_status
@@ -109,7 +109,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_respond_to_json
-      if respond_to? "#{action_name}_respond_to_json"
+      if respond_to? "#{action_name}_respond_to_json", true
         send("#{action_name}_respond_to_json")
       else
         render :text => response_object.to_json(:only => active_scaffold_config.send(action_name).columns.names), :content_type => Mime::JSON, :status => response_status
@@ -117,7 +117,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_respond_to_yaml
-      if respond_to? "#{action_name}_respond_to_yaml"
+      if respond_to? "#{action_name}_respond_to_yaml", true
         send("#{action_name}_respond_to_yaml")
       else
         render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
@@ -125,7 +125,7 @@ module ActiveScaffold::Actions
     end
 
     def batch_base_formats
-      if respond_to? "#{action_name}_formats"
+      if respond_to? "#{action_name}_formats", true
         send("#{action_name}_formats")
       else
         (default_formats + active_scaffold_config.formats + active_scaffold_config.send(action_name).formats).uniq

data/lib/active_scaffold/actions/batch_create.rb

@@ -50,9 +50,9 @@ module ActiveScaffold::Actions
         if marked_records_parent
           column = active_scaffold_config.columns[batch_create_by_column.to_sym]
           @batch_create_by_records = if column.polymorphic_association?
-            active_scaffold_config_for(params[:batch_create_by].singularize).model.find(marked_records_parent.to_a)
+            active_scaffold_config_for(params[:batch_create_by].singularize).model.find(marked_records_parent.keys)
           else
-            column_plural_assocation_value_from_value(column, marked_records_parent)
+            column_plural_assocation_value_from_value(column, marked_records_parent.keys)
           end
         end
       end
@@ -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] || Set.new
+          session_parent[:marked_records] || {}
         else
           false
         end
@@ -184,7 +184,7 @@ module ActiveScaffold::Actions
     def create_record_in_batch(created_by)
       @successful = nil
       @record = new_batch_create_record(created_by)
-      @record.send("#{batch_create_by_column.to_s}=", created_by)
+      @record.send("#{batch_create_by_column}=", created_by)
       batch_create_values.each do |attribute, value|
         set_record_attribute(value[:column], attribute, value[:value])
       end
@@ -192,7 +192,7 @@ module ActiveScaffold::Actions
       if authorized_for_job?(@record)
         create_save(@record)
         if successful?
-          marked_records_parent.delete(created_by.id) if batch_scope == 'MARKED' && marked_records_parent
+          marked_records_parent.delete(created_by.id.to_s) if batch_scope == 'MARKED' && marked_records_parent
         end
         error_records << @record unless successful? && !run_in_transaction?
       end
@@ -207,13 +207,21 @@ module ActiveScaffold::Actions
       columns.each :for => active_scaffold_config.model, :crud_type => :create, :flatten => true do |column|
         next unless attributes.has_key?(column.name)
         if column == batch_create_by_column.to_sym
-          @batch_create_by_records = column_plural_assocation_value_from_value(column, attributes[column.name])
+          @batch_create_by_records = batch_values_for_column(column, attributes[column.name])
         else
           values[column.name] = {:column => column, :value => column_value_from_param_value(nil, column, attributes[column.name])}
         end
       end
       values
     end
+
+    def batch_values_for_column(column, value)
+      if column.association
+        column_plural_assocation_value_from_value(column, value)
+      else
+        value.split("\n")
+      end
+    end
     
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
@@ -227,7 +235,7 @@ module ActiveScaffold::Actions
 
     def override_batch_create_value(form_ui)
       method = "batch_create_value_for_#{form_ui}"
-      method if respond_to? method
+      method if respond_to? method, true
     end
 
     def create_ignore?

data/lib/active_scaffold/actions/batch_destroy.rb

@@ -22,7 +22,7 @@ module ActiveScaffold::Actions
           destroy_record(record) if authorized_for_job?(record)
         end
       when :delete_all then
-        do_search if respond_to? :do_search
+        do_search if respond_to? :do_search, true
         # dummy condition cause we have to call delete_all on relation not on association
         beginning_of_chain.where('1=1').delete_all(all_conditions)
       else

data/lib/active_scaffold/actions/batch_update.rb

@@ -93,7 +93,7 @@ module ActiveScaffold::Actions
       when :update_all then
         updates = updates_for_update_all
         unless updates.first.empty?
-          do_search if respond_to? :do_search
+          do_search if respond_to? :do_search, true
           # all_conditions might fail cause joins are not working in update_all
           active_scaffold_config.model.update_all(updates, all_conditions)
         end
@@ -260,12 +260,12 @@ module ActiveScaffold::Actions
 
     def override_batch_update_value(form_ui)
       method = "batch_update_value_for_#{form_ui}"
-      method if respond_to? method
+      method if respond_to? method, true
     end
 
     def override_batch_update_all_value(form_ui)
       method = "batch_update_all_value_for_#{form_ui}"
-      method if respond_to? method
+      method if respond_to? method, true
     end
 
     private

data/lib/active_scaffold/helpers/batch_create_column_helpers.rb

@@ -9,8 +9,10 @@ module ActiveScaffold
 
         if column.form_ui == :record_select
           active_scaffold_record_select(column, options, batch_create_by_records, true)
-        else
+        elsif column.association
           active_scaffold_batch_create_singular_association(column, options)
+        else
+          text_area_tag(column.name, params[:record] ? params[:record][column.name] : '', options.merge(column.options[:html_options] || {}))
         end
 
       end

data/lib/active_scaffold/helpers/update_column_helpers.rb

@@ -6,10 +6,11 @@ module ActiveScaffold
       # It does not do any rendering. It only decides which method is responsible for rendering.
       def active_scaffold_update_for(column, scope = nil, options = {})
         options = active_scaffold_input_options(column, scope, options)
+        options.delete(:required)
 
         # first, check if the dev has created an override for this specific field for search
         if (method = override_update_field(column))
-          send(method, @record, options)
+          send(method, options[:object], options)
         # second, check if the dev has specified a valid form_ui for this column, using specific ui for searches
         elsif column.form_ui and (method = override_update(column.form_ui))
           send(method, column, options)

data/lib/active_scaffold_batch/version.rb

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 3
-  - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-19 00:00:00 Z
+date: 2014-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -25,16 +25,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -225653461
+        hash: 11
         segments: 
         - 3
         - 3
         - 0
-        - rc
-        version: 3.3.0.rc
+        version: 3.3.0
   version_requirements: *id001
-  prerelease: false
   name: active_scaffold
+  prerelease: false
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -117,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Batch Processing for ActiveScaffold