active_scaffold 3.2.15 → 3.2.16

data/CHANGELOG

@@ -1,4 +1,14 @@
-= 3.2.15 (not released yet)
+= 3.2.16
+- Fix use of column.css_class in form when is a proc, it wasn't skipped when form was a columns group
+- Fix constraints and colspan in self-referential associations
+- Fix rendering parent row after creating or updating in a nested form (singular associations)
+- Translate include_blank and prompt in form_ui :select
+- Fix mark for nested scaffolds
+- Fix STI creation
+- Fix null search for numeric columns
+- Fix recordselect inplace_edit with plural associations in ruby 1.9
+
+= 3.2.15
 - Prepare to unify field overrides and list_ui method signatures
 - Add :optional to update.persistent
 - Add missing triggering of as:element_updated in new subform rows

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -504,6 +504,13 @@ var ActiveScaffold = {
     this.increment_record_count(tbody.closest('div.active-scaffold'));
     ActiveScaffold.highlight(new_row);
   },
+    
+  create_record_row_from_url: function(active_scaffold_id, url, options) {
+    jQuery.get(url, function(row) {
+      ActiveScaffold.create_record_row(action_link.scaffold(), row, options);
+      action_link.close();
+    });
+  },
   
   delete_record_row: function(row, page_reload_url) {
     if (typeof(row) == 'string') row = '#' + row;

data/app/assets/javascripts/prototype/active_scaffold.js

@@ -454,6 +454,16 @@ var ActiveScaffold = {
     this.increment_record_count(tbody.up('div.active-scaffold'));
     ActiveScaffold.highlight(new_row);
   },
+    
+  create_record_row_from_url: function(action_link, url, options) {
+    new Ajax.Request(url, {
+      method: 'get',
+      onComplete: function(response) {
+        ActiveScaffold.create_record_row(action_link.scaffold(), row, options);
+        action_link.close();
+      }
+    });
+  },
   
   delete_record_row: function(row, page_reload_url) {
     row = $(row);

data/frontends/default/views/_form.html.erb

@@ -5,21 +5,22 @@
 %>
 <ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"".html_safe if columns.collapsed %>>
   <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
+  <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
   <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
-  <li class="sub-section <%= column.css_class %>">
+  <li class="sub-section <%= column_css_class %>">
     <h5><%= column.label %></h5>
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
   <% elsif renders_as == :subform and !override_form_field?(column) and authorized -%>
-  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
+  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column_css_class %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
     <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :scope => scope } -%>
   </li>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>">
+  <li class="form-element <%= 'required' if column.required? %> <%= column_css_class %>">
     <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :only_value => !authorized, :scope => scope } -%>
   </li>
   <% end -%>

data/frontends/default/views/_list_inline_adapter.html.erb

@@ -5,7 +5,8 @@
     else
       active_scaffold_config
     end
-    config.list.columns.count + 1
+    # increment in 1 for self-associations, parent_model config will have constraints too
+    config.list.columns.count + 1 + (config == active_scaffold_config ? 1 : 0)
   end
 %>
 <%# nested_id, allows us to remove a nested scaffold programmatically %>

data/frontends/default/views/on_create.js.erb

@@ -5,8 +5,10 @@ var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
   <% if render_parent? %>
-    <% if nested_singular_association? || render_parent_action == :row %>
+    <% if nested_singular_association? %>
       action_link.close(true);
+    <% elsif params[:parent_sti] && render_parent_action == :row %>
+      ActiveScaffold.create_record_row_from_url(action_link,'<%= url_for(render_parent_options) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
     <% else %>
       ActiveScaffold.reload('<%= url_for render_parent_options %>');
     <% end %>

data/lib/active_scaffold/actions/core.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
-        before_filter :register_constraints_with_action_columns, :if => :embedded?
+        prepend_before_filter :register_constraints_with_action_columns, :unless => :nested?
         after_filter :clear_flashes
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
@@ -169,11 +169,12 @@ module ActiveScaffold::Actions
 
     def new_model
       model = beginning_of_chain
-      if model.columns_hash[column = model.inheritance_column]
-        build_options = {column.to_sym => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
+      if nested? && nested.association && nested.association.collection? && model.columns_hash[column = model.inheritance_column]
         model_name = params.delete(column) # in new action inheritance_column must be in params
         model_name ||= params[:record].delete(column) unless params[:record].blank? # in create action must be inside record key
-        model = model_name.camelize.constantize if model_name
+        model_name = model_name.camelize if model_name
+        model_name ||= active_scaffold_config.model.name
+        build_options = {column.to_sym => model_name} if model_name
       end
       model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end

data/lib/active_scaffold/actions/list.rb

@@ -50,6 +50,10 @@ module ActiveScaffold::Actions
       render :text => Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
     
+    def row_respond_to_html
+      render(:partial => 'row', :locals => {:record => @record})
+    end
+    
     def row_respond_to_js
       render
     end

data/lib/active_scaffold/actions/mark.rb

@@ -3,7 +3,7 @@ module ActiveScaffold::Actions
 
     def self.included(base)
       base.before_filter :mark_authorized?, :only => :mark
-      base.prepend_before_filter :assign_marked_records_to_model
+      base.before_filter :assign_marked_records_to_model
       base.helper_method :marked_records
     end
 
@@ -14,9 +14,8 @@ module ActiveScaffold::Actions
         do_demark
       end
       if marked_records.length > 0
-        link = "<a href=\"#{url_for(:action=>:mark, :id=>'', :mark_target => :scope)}\" data-method=\"post\" data-remote=\"true\">#{as_ :mark_all_records}</a>"
         count = marked_records.length
-        flash[:info] = as_(:records_marked, :count => count, :model => active_scaffold_config.label(:count => count), :link => link)
+        flash[:info] = as_(:records_marked, :count => count, :model => active_scaffold_config.label(:count => count))
       end
       respond_to_action(:mark)
     end

data/lib/active_scaffold/attribute_params.rb

@@ -103,7 +103,7 @@ module ActiveScaffold
         # it's a single id
         column.association.klass.find(value) if value and not value.empty?
       elsif column.plural_association?
-        column_plural_assocation_value_from_value(column, value)
+        column_plural_assocation_value_from_value(column, Array(value))
       elsif column.number? && [:i18n_number, :currency].include?(column.options[:format])
         self.class.i18n_number_to_native_format(value)
       else

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -135,11 +135,11 @@ module ActiveScaffold::DataStructures
       @constrained_fields = Set.new
       constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
-        if !current.belongs_to? && association.foreign_key == current.association_foreign_key
+        if !current.belongs_to? && association != current && association.foreign_key.to_s == current.association_foreign_key.to_s
           constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
-        if association.foreign_key == current.foreign_key
+        if association.foreign_key.to_s == current.foreign_key.to_s
           # show columns for has_many and has_one child associationes
           constrained_fields << current.name.to_sym if current.belongs_to?
           if association.options[:as] and current.options[:polymorphic]

data/lib/active_scaffold/finder.rb

@@ -84,6 +84,8 @@ module ActiveScaffold
       def condition_for_numeric(column, value)
         if !value.is_a?(Hash)
           ["%{search_sql} = ?", condition_value_for_numeric(column, value)]
+        elsif ActiveScaffold::Finder::NullComparators.include?(value[:opt])
+          condition_for_null_type(column, value[:opt])
         elsif value[:from].blank? or not ActiveScaffold::Finder::NumericComparators.include?(value[:opt])
           nil
         elsif value[:opt] == 'BETWEEN'

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -63,12 +63,8 @@ module ActiveScaffold
         if nested_singular_association?
           {:controller => nested.parent_scaffold.controller_path, :action => :row, :id => nested.parent_id}
         elsif params[:parent_sti]
-          options = {:controller => params[:parent_sti], :action => render_parent_action}
-          if render_parent_action(params[:parent_sti]) == :index
-            options.merge(params.slice(:eid))
-          else
-            options.merge({:id => @record.id})
-          end
+          options = params_for(:controller => params[:parent_sti], :action => render_parent_action, :parent_sti => nil)
+          options.merge(:id => @record.id) if render_parent_action == :row
         end
       end
 

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -100,6 +100,12 @@ module ActiveScaffold
       ## Form input methods
       ##
 
+      def active_scaffold_translate_select_options(options)
+        options[:include_blank] = as_(options[:include_blank]) if options[:include_blank].is_a? Symbol
+        options[:prompt] = as_(options[:prompt]) if options[:prompt].is_a? Symbol
+        options
+      end
+      
       def active_scaffold_input_singular_association(column, html_options)
         associated = @record.send(column.association.name)
 
@@ -113,6 +119,7 @@ module ActiveScaffold
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
         html_options[:name] = "#{html_options[:name]}[]" if (html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]"))
+        active_scaffold_translate_select_options(options)
         select(:record, method, select_options.uniq, options, html_options)
       end
 
@@ -153,6 +160,7 @@ module ActiveScaffold
         end
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
+        active_scaffold_translate_select_options(options)
         select(:record, column.name, options_for_select, options, html_options)
       end
 

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -14,7 +14,7 @@ module ActiveScaffold
         else
           case search_ui
           when :integer, :decimal, :float
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options)} #{value[:opt] == 'BETWEEN' ? '- ' + format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options).to_s : ''}"
+            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options) if value[:from].present?} #{value[:opt] == 'BETWEEN' ? '- ' + format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options).to_s : ''}"
           when :string
             opt = ActiveScaffold::Finder::StringComparators.index(value[:opt]) || value[:opt]
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{value[:from]}' #{opt == 'BETWEEN' ? '- ' + value[:to].to_s : ''}"

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -335,7 +335,7 @@ module ActiveScaffold
         if column.name == :as_marked
           tag_options[:data] = {
             :ie_mode => :inline_checkbox,
-            :ie_url => url_for(:controller => params_for[:controller], :action => 'mark', :id => '__id__', :eid => params[:eid])
+            :ie_url => url_for(params_for(:action => 'mark', :id => '__id__'))
           }
         else
           tag_options[:data] = inplace_edit_data(column) if column.inplace_edit

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -124,9 +124,16 @@ module ActiveScaffold
         url_options.delete(:search) if link.controller and link.controller.to_s != params[:controller]
         url_options.merge! link.parameters if link.parameters
         if link.dynamic_parameters.is_a?(Proc)
-          @link_record = record
-          url_options.merge! self.instance_eval(&(link.dynamic_parameters)) 
-          @link_record = nil
+          if record.nil?
+            url_options.merge! link.dynamic_parameters.call
+          elsif link.dynamic_parameters.arity == 0
+            ActiveSupport::Deprecation.warn("dynamic_parameters must be a block with an argument for member action links, instead of using @link_record")
+            @link_record = record
+            url_options.merge! self.instance_eval(&(link.dynamic_parameters))
+            @link_record = nil
+          else
+            url_options.merge! link.dynamic_parameters.call(record)
+          end
         end
         url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
         url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
@@ -172,7 +179,7 @@ module ActiveScaffold
           id = "#{column.association.name}-#{record.id}" unless record.nil?
         end if column && column.singular_association?
         id = "#{id}-#{url_options[:batch_scope].downcase}" if url_options[:batch_scope]
-        action_id = "#{id_from_controller(url_options[:controller]) + '-' if url_options[:parent_controller]}#{url_options[:action].to_s}"
+        action_id = "#{id_from_controller(url_options[:controller]) + '-' if url_options[:parent_controller] || url_options[:controller] != controller.controller_path}#{url_options[:action].to_s}"
         action_link_id(action_id, id)
       end
       

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 47
   prerelease: 
   segments: 
   - 3
   - 2
-  - 15
-  version: 3.2.15
+  - 16
+  version: 3.2.16
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-07 00:00:00 Z
+date: 2012-09-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id001
-  prerelease: false
   name: shoulda
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -45,8 +45,8 @@ dependencies:
         - 0
         version: 1.0.0
   version_requirements: *id002
-  prerelease: false
   name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -59,8 +59,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id003
-  prerelease: false
   name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -75,8 +75,8 @@ dependencies:
         - 3
         version: 3.1.3
   version_requirements: *id004
-  prerelease: false
   name: rails
+  prerelease: false
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -276,7 +276,6 @@ files:
 - lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_controller_rescueing.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
-- lib/active_scaffold/extensions/active_association_reflection.rb
 - lib/active_scaffold/extensions/active_record_offset.rb
 - lib/active_scaffold/extensions/array.rb
 - lib/active_scaffold/extensions/cache_association.rb
@@ -443,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery

data/lib/active_scaffold/extensions/active_association_reflection.rb

@@ -1,22 +0,0 @@
-# Bugfix: building an sti model from an association fails
-# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6306-collection-associations-build-method-not-supported-for-sti
-# https://github.com/rails/rails/issues/815
-# https://github.com/rails/rails/pull/1686
-ActiveRecord::Reflection::AssociationReflection.class_eval do
-  def klass_with_sti(*opts)
-    sti_col = klass.inheritance_column
-    if sti_col and (h = opts.first).is_a? Hash and (passed_type = ( h[sti_col] || h[sti_col.to_sym] )) and (new_klass = active_record.send(:compute_type, passed_type)) < klass
-      new_klass
-    else
-      klass
-    end
-  end
-  def build_association(*opts, &block)
-    @original_build_association_called = true # FIXME: remove when 3.1 support is dropped
-    klass_with_sti(*opts).new(*opts, &block)
-  end
-  def create_association(*opts, &block)
-    @original_build_association_called = true # FIXME: remove when 3.1 support is dropped
-    klass_with_sti(*opts).create(*opts, &block)
-  end
-end