brisk-bills 0.7.0 → 0.8.1

data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/search.rb

@@ -1,40 +1,54 @@
-module ActiveScaffold::Actions
-  module Search
-    def self.included(base)
-      base.before_filter :search_authorized?, :only => :show_search
-      base.before_filter :do_search
-    end
-
-    def show_search
-      respond_to do |type|
-        type.html { render(:action => "search") }
-        type.js { render(:partial => "search") }
-      end
-    end
-
-    protected
-
-    def do_search
-      @query = params[:search].to_s.strip rescue ''
-
-      unless @query.empty?
-        columns = active_scaffold_config.search.columns
-        like_pattern = active_scaffold_config.search.full_text_search? ? '%?%' : '?%'
-        search_conditions = self.class.create_conditions_for_columns(@query.split(' '), columns, like_pattern)
-        self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions)
-        @filtered = !search_conditions.blank?
-
-        includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
-        self.active_scaffold_joins.concat includes_for_search_columns
-
-        active_scaffold_config.list.user.page = nil
-      end
-    end
-
-    # The default security delegates to ActiveRecordPermissions.
-    # You may override the method to customize.
-    def search_authorized?
-      authorized_for?(:action => :read)
-    end
-  end
-end
+module ActiveScaffold::Actions
+  module Search
+    include ActiveScaffold::Actions::CommonSearch
+    def self.included(base)
+      base.before_filter :search_authorized_filter, :only => :show_search
+      base.before_filter :store_search_params_into_session, :only => [:list, :index]
+      base.before_filter :do_search, :only => [:list, :index]
+      base.helper_method :search_params
+    end
+
+    def show_search
+      respond_to_action(:search)
+    end
+
+    protected
+    def search_respond_to_html
+      render(:action => "search")
+    end
+    def search_respond_to_js
+      render(:partial => "search")
+    end
+    def do_search
+      query = search_params.to_s.strip rescue ''
+
+      unless query.empty?
+        columns = active_scaffold_config.search.columns
+        text_search = active_scaffold_config.search.text_search
+        query = query.split(active_scaffold_config.search.split_terms) if active_scaffold_config.search.split_terms
+        search_conditions = self.class.create_conditions_for_columns(query, columns, text_search)
+        self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions)
+        @filtered = !search_conditions.blank?
+
+        includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
+        self.active_scaffold_includes.concat includes_for_search_columns
+
+        active_scaffold_config.list.user.page = nil
+      end
+    end
+
+    # The default security delegates to ActiveRecordPermissions.
+    # You may override the method to customize.
+    def search_authorized?
+      authorized_for?(:crud_type => :read)
+    end
+    private
+    def search_authorized_filter
+      link = active_scaffold_config.search.link || active_scaffold_config.search.class.link
+      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+    end
+    def search_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
+    end
+  end
+end

data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/show.rb

@@ -1,24 +1,36 @@
 module ActiveScaffold::Actions
   module Show
     def self.included(base)
-      base.before_filter :show_authorized?, :only => :show
+      base.before_filter :show_authorized_filter, :only => :show
     end
 
     def show
       do_show
-
       successful?
-      respond_to do |type|
-        type.html { render :action => 'show' }
-        type.js { render :partial => 'show' }
-        type.xml { render :xml => response_object.to_xml, :content_type => Mime::XML, :status => response_status }
-        type.json { render :text => response_object.to_json, :content_type => Mime::JSON, :status => response_status }
-        type.yaml { render :text => response_object.to_yaml, :content_type => Mime::YAML, :status => response_status }
-      end
+      respond_to_action(:show)
     end
 
     protected
+    
+    def show_respond_to_json
+      render :text => response_object.to_json(:only => active_scaffold_config.show.columns.names), :content_type => Mime::JSON, :status => response_status
+    end
+
+    def show_respond_to_yaml
+      render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.show.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+    end
+
+    def show_respond_to_xml
+      render :xml => response_object.to_xml(:only => active_scaffold_config.show.columns.names), :content_type => Mime::XML, :status => response_status
+    end
 
+    def show_respond_to_js
+      render :partial => 'show'
+    end
+
+    def show_respond_to_html
+      render :action => 'show'
+    end
     # A simple method to retrieve and prepare a record for showing.
     # May be overridden to customize show routine
     def do_show
@@ -28,7 +40,15 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def show_authorized?
-      authorized_for?(:action => :read)
+      authorized_for?(:crud_type => :read)
+    end
+    private 
+    def show_authorized_filter
+      link = active_scaffold_config.show.link || active_scaffold_config.show.class.link
+      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+    end
+    def show_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.show.formats).uniq
     end
   end
 end

data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/update.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::Actions
   module Update
     def self.included(base)
-      base.before_filter :update_authorized?, :only => [:edit, :update]
+      base.before_filter :update_authorized_filter, :only => [:edit, :update]
       base.verify :method => [:post, :put],
                   :only => :update,
                   :redirect_to => { :action => :index }
@@ -9,50 +9,12 @@ module ActiveScaffold::Actions
 
     def edit
       do_edit
-
-      respond_to do |type|
-        type.html do
-          if successful?
-            render(:action => 'update')
-          else
-            return_to_main
-          end
-        end
-        type.js do
-          render(:partial => 'update_form')
-        end
-      end
+      respond_to_action(:edit)
     end
 
     def update
       do_update
-
-      respond_to do |type|
-        type.html do
-          if params[:iframe]=='true' # was this an iframe post ?
-            responds_to_parent do
-              if successful?
-                render :action => 'on_update'
-              else
-                render :action => 'form_messages_on_update'
-              end
-            end
-          else # just a regular post
-            if successful?
-              flash[:info] = as_(:updated_model, :model => @record.to_label)
-              return_to_main
-            else
-              render(:action => 'update')
-            end
-          end
-        end
-        type.js do
-          render :action => 'on_update'
-        end
-        type.xml { render :xml => response_object.to_xml, :content_type => Mime::XML, :status => response_status }
-        type.json { render :text => response_object.to_json, :content_type => Mime::JSON, :status => response_status }
-        type.yaml { render :text => response_object.to_yaml, :content_type => Mime::YAML, :status => response_status }
-      end
+      respond_to_action(:update)
     end
 
     # for inline (inlist) editing
@@ -62,7 +24,42 @@ module ActiveScaffold::Actions
     end
 
     protected
-
+    def edit_respond_to_html
+      if successful?
+        render(:action => 'update')
+      else
+        return_to_main
+      end
+    end
+    def edit_respond_to_js
+      render(:partial => 'update_form')
+    end
+    def update_respond_to_html  
+      if params[:iframe]=='true' # was this an iframe post ?
+        responds_to_parent do
+          render :action => 'on_update.js'
+        end
+      else # just a regular post
+        if successful?
+          flash[:info] = as_(:updated_model, :model => @record.to_label)
+          return_to_main
+        else
+          render(:action => 'update')
+        end
+      end
+    end
+    def update_respond_to_js
+      render :action => 'on_update'
+    end
+    def update_respond_to_xml
+      render :xml => response_object.to_xml(:only => active_scaffold_config.update.columns.names), :content_type => Mime::XML, :status => response_status
+    end
+    def update_respond_to_json
+      render :text => response_object.to_json(:only => active_scaffold_config.update.columns.names), :content_type => Mime::JSON, :status => response_status
+    end
+    def update_respond_to_yaml
+      render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.update.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+    end
     # A simple method to find and prepare a record for editing
     # May be overridden to customize the record (set default values, etc.)
     def do_edit
@@ -72,7 +69,7 @@ module ActiveScaffold::Actions
     # A complex method to update a record. The complexity comes from the support for subforms, and saving associated records.
     # If you want to customize this algorithm, consider using the +before_update_save+ callback
     def do_update
-      @record = find_if_allowed(params[:id], :update)
+      do_edit
       begin
         active_scaffold_config.model.transaction do
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record])
@@ -87,15 +84,22 @@ module ActiveScaffold::Actions
       rescue ActiveRecord::StaleObjectError
         @record.errors.add_to_base as_(:version_inconsistency)
         self.successful=false
+      rescue ActiveRecord::RecordNotSaved
+        @record.errors.add_to_base as_(:failed_to_save_record) if @record.errors.empty?
+        self.successful = false
       end
     end
 
     def do_update_column
-      @record = find_if_allowed(params[:id], :update)
-      if @record.authorized_for?(:action => :update, :column => params[:column])
-        params[:value] ||= @record.column_for_attribute(params[:column]).default unless @record.column_for_attribute(params[:column]).null
+      @record = active_scaffold_config.model.find(params[:id])
+      if @record.authorized_for?(:crud_type => :update, :column => params[:column])
+        column = active_scaffold_config.columns[params[:column].to_sym]
+        params[:value] ||= @record.column_for_attribute(params[:column]).default unless @record.column_for_attribute(params[:column]).nil? || @record.column_for_attribute(params[:column]).null
+        params[:value] = column_value_from_param_value(@record, column, params[:value]) unless column.nil?
         @record.send("#{params[:column]}=", params[:value])
+        before_update_save(@record)
         @record.save
+        after_update_save(@record)
       end
     end
 
@@ -108,7 +112,18 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def update_authorized?
-      authorized_for?(:action => :update)
+      authorized_for?(:crud_type => :update)
+    end
+    private
+    def update_authorized_filter
+      link = active_scaffold_config.update.link || active_scaffold_config.update.class.link
+      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+    end
+    def edit_formats
+      (default_formats + active_scaffold_config.formats).uniq
+    end
+    def update_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.update.formats).uniq
     end
   end
 end

data/vendor/plugins/active_scaffold/lib/active_scaffold/attribute_params.rb

@@ -1,185 +1,187 @@
-module ActiveScaffold
-  # Provides support for param hashes assumed to be model attributes.
-  # Support is primarily needed for creating/editing associated records using a nested hash structure.
-  #
-  # Paradigm Params Hash (should write unit tests on this):
-  #   params[:record] = {
-  #     # a simple record attribute
-  #     'name' => 'John',
-  #     # a plural association hash
-  #     'roles' => {
-  #       # associate with an existing role
-  #       '5' => {'id' => 5}
-  #       # associate with an existing role and edit it
-  #       '6' => {'id' => 6, 'name' => 'designer'}
-  #       # create and associate a new role
-  #       '124521' => {'name' => 'marketer'}
-  #     }
-  #     # a singular association hash
-  #     'location' => {'id' => 12, 'city' => 'New York'}
-  #   }
-  #
-  # Simpler association structures are also supported, like:
-  #   params[:record] = {
-  #     # a simple record attribute
-  #     'name' => 'John',
-  #     # a plural association ... all ids refer to existing records
-  #     'roles' => ['5', '6'],
-  #     # a singular association ... all ids refer to existing records
-  #     'location' => '12'
-  # }
-  module AttributeParams
-    # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for
-    # association attributes and attempts to instantiate them as associated objects.
-    #
-    # This is a secure way to apply params to a record, because it's based on a loop over the columns
-    # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns.
-    def update_record_from_params(parent_record, columns, attributes)
-      action = parent_record.new_record? ? :create : :update
-      return parent_record unless parent_record.authorized_for?(:action => action)
-
-      multi_parameter_attributes = {}
-      attributes.each do |k, v|
-        next unless k.include? '('
-        column_name = k.split('(').first.to_sym
-        multi_parameter_attributes[column_name] ||= []
-        multi_parameter_attributes[column_name] << [k, v]
-      end
-
-      columns.each :for => parent_record, :action => action, :flatten => true do |column|
-        if multi_parameter_attributes.has_key? column.name
-          parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name])
-        elsif attributes.has_key? column.name
-          value = attributes[column.name]
-
-          # convert the value, possibly by instantiating associated objects
-          value = if value.is_a?(Hash)
-            # this is just for backwards compatibility. we should clean this up in 2.0.
-            if column.form_ui == :select
-              ids = if column.singular_association?
-                value[:id]
-              else
-                value.values.collect {|hash| hash[:id]}
-              end
-              (ids and not ids.empty?) ? column.association.klass.find(ids) : nil
-
-            elsif column.singular_association?
-              hash = value
-              record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}"))
-              if record
-                record_columns = active_scaffold_config_for(column.association.klass).subform.columns
-                update_record_from_params(record, record_columns, hash)
-                record.unsaved = true
-              end
-              record
-
-            elsif column.plural_association?
-              collection = value.collect do |key_value_pair|
-                hash = key_value_pair[1]
-                record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}"))
-                if record
-                  record_columns = active_scaffold_config_for(column.association.klass).subform.columns
-                  update_record_from_params(record, record_columns, hash)
-                  record.unsaved = true
-                end
-                record
-              end
-              collection.compact
-            end
-          else
-            if column.singular_association?
-              # it's a single id
-              column.association.klass.find(value) if value and not value.empty?
-            elsif column.plural_association?
-              # it's an array of ids
-              column.association.klass.find(value) if value and not value.empty?
-            else
-              # convert empty strings into nil. this works better with 'null => true' columns (and validations),
-              # and 'null => false' columns should just convert back to an empty string.
-              # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed
-              value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
-              value
-            end
-          end
-
-          # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace)
-          parent_record.send("#{column.name}=", value) unless column.through_association? or parent_record.send(column.name) == value
-          
-          # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
-          unless column.params.empty?
-            column.params.each{|p| parent_record.send("#{p}=", attributes[p])}
-          end
-
-        # plural associations may not actually appear in the params if all of the options have been unselected or cleared away.
-        # NOTE: the "form_ui" check isn't really necessary, except that without it we have problems
-        # with subforms. the UI cuts out deep associations, which means they're not present in the
-        # params even though they're in the columns list. the result is that associations were being
-        # emptied out way too often. BUT ... this means there's still a lingering bug in the default association
-        # form code: you can't delete the last association in the list.
-        elsif column.form_ui and column.plural_association? and not column.through_association?
-          parent_record.send("#{column.name}=", [])
-        end
-      end
-
-      if parent_record.new_record?
-        parent_record.class.reflect_on_all_associations.each do |a|
-          next unless [:has_one, :has_many].include?(a.macro) and not a.options[:through]
-          next unless association_proxy = parent_record.send(a.name)
-
-          raise ActiveScaffold::ReverseAssociationRequired, "In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse
-
-          association_proxy = [association_proxy] if a.macro == :has_one
-          association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) }
-        end
-      end
-
-      parent_record
-    end
-
-    # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
-    # request parameters given. If params[:id] exists it will attempt to find an existing object
-    # otherwise it will build a new one.
-    def find_or_create_for_params(params, parent_column, current)
-      klass = parent_column.association.klass
-      return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass)
-
-      if params.has_key? :id
-        # modifying the current object of a singular association
-        if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id]
-          return current
-        # modifying one of the current objects in a plural association
-        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]}
-          return current.detect {|o| o.id.to_s == params[:id]}
-        # attaching an existing but not-current object
-        else
-          return klass.find(params[:id])
-        end
-      else
-        return klass.new if klass.authorized_for?(:action => :create)
-      end
-    end
-
-    # Determines whether the given attributes hash is "empty".
-    # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
-    def attributes_hash_is_empty?(hash, klass)
-      hash.all? do |key,value|
-        # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at'
-        column_name = key.to_s.split('(').first
-        column = klass.columns_hash[column_name]
-
-        # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty.
-        # this could be a bad idea. but the current situation (excess record entry) seems worse.
-        next true if column and [:boolean, :datetime, :date, :time].include?(column.type)
-
-        # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row.
-        next true if column and value == column.default.to_s
-
-        if value.is_a?(Hash)
-          attributes_hash_is_empty?(value, klass)
-        else
-          value.respond_to?(:empty?) ? value.empty? : false
-        end
-      end
-    end
-  end
-end
+module ActiveScaffold
+  # Provides support for param hashes assumed to be model attributes.
+  # Support is primarily needed for creating/editing associated records using a nested hash structure.
+  #
+  # Paradigm Params Hash (should write unit tests on this):
+  #   params[:record] = {
+  #     # a simple record attribute
+  #     'name' => 'John',
+  #     # a plural association hash
+  #     'roles' => {
+  #       # associate with an existing role
+  #       '5' => {'id' => 5}
+  #       # associate with an existing role and edit it
+  #       '6' => {'id' => 6, 'name' => 'designer'}
+  #       # create and associate a new role
+  #       '124521' => {'name' => 'marketer'}
+  #     }
+  #     # a singular association hash
+  #     'location' => {'id' => 12, 'city' => 'New York'}
+  #   }
+  #
+  # Simpler association structures are also supported, like:
+  #   params[:record] = {
+  #     # a simple record attribute
+  #     'name' => 'John',
+  #     # a plural association ... all ids refer to existing records
+  #     'roles' => ['5', '6'],
+  #     # a singular association ... all ids refer to existing records
+  #     'location' => '12'
+  # }
+  module AttributeParams
+    protected
+    # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for
+    # association attributes and attempts to instantiate them as associated objects.
+    #
+    # This is a secure way to apply params to a record, because it's based on a loop over the columns
+    # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns.
+    def update_record_from_params(parent_record, columns, attributes)
+      crud_type = parent_record.new_record? ? :create : :update
+      return parent_record unless parent_record.authorized_for?(:crud_type => crud_type)
+
+      multi_parameter_attributes = {}
+      attributes.each do |k, v|
+        next unless k.include? '('
+        column_name = k.split('(').first.to_sym
+        multi_parameter_attributes[column_name] ||= []
+        multi_parameter_attributes[column_name] << [k, v]
+      end
+
+      columns.each :for => parent_record, :crud_type => crud_type, :flatten => true do |column|
+        # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
+        unless column.params.empty?
+          column.params.each{|p| parent_record.send("#{p}=", attributes[p]) if attributes.has_key? p}
+        end
+
+        if multi_parameter_attributes.has_key? column.name
+          parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name])
+        elsif attributes.has_key? column.name
+          value = column_value_from_param_value(parent_record, column, attributes[column.name]) 
+
+          # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace)
+          parent_record.send("#{column.name}=", value) unless parent_record.send(column.name) == value
+          
+        elsif column.plural_association?
+          parent_record.send("#{column.name}=", [])
+        end
+      end
+
+      if parent_record.new_record?
+        parent_record.class.reflect_on_all_associations.each do |a|
+          next unless [:has_one, :has_many].include?(a.macro) and not (a.options[:through] || a.options[:finder_sql])
+          next unless association_proxy = parent_record.send(a.name)
+
+          raise ActiveScaffold::ReverseAssociationRequired, "Association #{a.name}: In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse
+
+          association_proxy = [association_proxy] if a.macro == :has_one
+          association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) }
+        end
+      end
+
+      parent_record
+    end
+    
+    def manage_nested_record_from_params(parent_record, column, attributes)
+      record = find_or_create_for_params(attributes, column, parent_record)
+      if record
+        record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        update_record_from_params(record, record_columns, attributes)
+        record.unsaved = true
+      end
+      record
+    end
+    
+    def column_value_from_param_value(parent_record, column, value)
+      # convert the value, possibly by instantiating associated objects
+      if value.is_a?(Hash)
+        # this is just for backwards compatibility. we should clean this up in 2.0.
+        if column.form_ui == :select
+          ids = if column.singular_association?
+            value[:id]
+          else
+            value.values.collect {|hash| hash[:id]}
+          end
+          (ids and not ids.empty?) ? column.association.klass.find(ids) : nil
+
+        elsif column.singular_association?
+          manage_nested_record_from_params(parent_record, column, value)
+        elsif column.plural_association?
+          # sort by id or temporary id so new records are created in the same order as user write them
+          value.sort.collect {|key_value_pair| manage_nested_record_from_params(parent_record, column, key_value_pair[1])}.compact
+        else
+          value
+        end
+      else
+        if column.singular_association?
+          # it's a single id
+          column.association.klass.find(value) if value and not value.empty?
+        elsif column.plural_association?
+          # it's an array of ids
+          column.association.klass.find(value) if value and not value.empty?
+        elsif column.column && column.column.number? && column.options[:format]
+          column.number_to_native(value)
+        else
+          # convert empty strings into nil. this works better with 'null => true' columns (and validations),
+          # and 'null => false' columns should just convert back to an empty string.
+          # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed
+          value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
+          value
+        end
+      end
+    end
+
+   # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
+    # request parameters given. If params[:id] exists it will attempt to find an existing object
+    # otherwise it will build a new one.
+    def find_or_create_for_params(params, parent_column, parent_record)
+      current = parent_record.send(parent_column.name)
+      klass = parent_column.association.klass
+      pk = klass.primary_key.to_sym
+      return nil if parent_column.show_blank_record?(current) and attributes_hash_is_empty?(params, klass)
+
+      if params.has_key? pk
+        # modifying the current object of a singular association
+        pk_val = params[pk] 
+        if current and current.is_a? ActiveRecord::Base and current.id.to_s == pk_val
+          return current
+        # modifying one of the current objects in a plural association
+        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == pk_val}
+          return current.detect {|o| o.id.to_s == pk_val}
+        # attaching an existing but not-current object
+        else
+          return klass.find(pk_val)
+        end
+      else
+        if klass.authorized_for?(:crud_type => :create)
+          if parent_column.singular_association?
+            return parent_record.send("build_#{parent_column.name}")
+          else
+            return parent_record.send(parent_column.name).build
+          end
+        end
+      end
+    end
+    # Determines whether the given attributes hash is "empty".
+    # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
+    def attributes_hash_is_empty?(hash, klass)
+      hash.all? do |key,value|
+        # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at'
+        column_name = key.to_s.split('(').first
+        column = klass.columns_hash[column_name]
+
+        # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty.
+        # this could be a bad idea. but the current situation (excess record entry) seems worse.
+        next true if column and [:boolean, :datetime, :date, :time].include?(column.type)
+
+        # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row.
+        next true if column and value == column.default.to_s
+
+        if value.is_a?(Hash)
+          attributes_hash_is_empty?(value, klass)
+        else
+          value.respond_to?(:empty?) ? value.empty? : false
+        end
+      end
+    end
+  end
+end