active_scaffold 3.3.3 → 3.4.0

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -11,54 +11,56 @@ module ActiveScaffold
       end
 
       def active_scaffold_render_input(column, options)
-        begin
-          # first, check if the dev has created an override for this specific field
-          if (method = override_form_field(column))
-            send(method, options[:object] || @record, options)
-          # second, check if the dev has specified a valid form_ui for this column
-          elsif column.form_ui and (method = override_input(column.form_ui))
-            send(method, column, options)
-          # fallback: we get to make the decision
-          else
-            if column.association
-              if column.form_ui.nil?
-                # its an association and nothing is specified, we will assume form_ui :select
-                active_scaffold_input_select(column, options)
-              else
-                # if we get here, it's because the column has a form_ui but not one ActiveScaffold knows about.
-                raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'"
-              end
-            elsif column.virtual?
-              options[:value] = format_number_value((options[:object] || @record).send(column.name), column.options) if column.number?
-              active_scaffold_input_virtual(column, options)
-
-            else # regular model attribute column
-              # if we (or someone else) have created a custom render option for the column type, use that
-              if (method = override_input(column.column.type))
-                send(method, column, options)
-              # final ultimate fallback: use rails' generic input method
-              else
-                # for textual fields we pass different options
-                text_types = [:text, :string, :integer, :float, :decimal, :date, :time, :datetime]
-                options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
-                if column.column.type == :string && options[:maxlength].blank?
-                  options[:maxlength] = column.column.limit
-                  options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
-                end
-                options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
-                options[:value] = format_number_value((options[:object] || @record).send(column.name), column.options) if column.number?
-                text_field(:record, column.name, options.merge(column.options))
+        record = options[:object]
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+
+        # first, check if the dev has created an override for this specific field
+        if (method = override_form_field(column))
+          send(method, record, options)
+        # second, check if the dev has specified a valid form_ui for this column
+        elsif column.form_ui and (method = override_input(column.form_ui))
+          send(method, column, options)
+        # fallback: we get to make the decision
+        else
+          if column.association
+            if column.form_ui.nil?
+              # its an association and nothing is specified, we will assume form_ui :select
+              active_scaffold_input_select(column, options)
+            else
+              # if we get here, it's because the column has a form_ui but not one ActiveScaffold knows about.
+              raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'"
+            end
+          elsif column.virtual?
+            options[:value] = format_number_value(record.send(column.name), column.options) if column.number?
+            active_scaffold_input_virtual(column, options)
+
+          else # regular model attribute column
+            # if we (or someone else) have created a custom render option for the column type, use that
+            if (method = override_input(column.column.type))
+              send(method, column, options)
+            # final ultimate fallback: use rails' generic input method
+            else
+              # for textual fields we pass different options
+              text_types = [:text, :string, :integer, :float, :decimal, :date, :time, :datetime]
+              options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
+              if column.column.type == :string && options[:maxlength].blank?
+                options[:maxlength] = column.column.limit
+                options[:size] ||= options[:maxlength].to_i > 30 ? 30 : options[:maxlength]
               end
+              options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
+              options[:value] = format_number_value(record.send(column.name), column.options) if column.number?
+              text_field(:record, column.name, options.merge(column.options))
             end
           end
-        rescue Exception => e
-          logger.error Time.now.to_s + "#{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-          raise e
         end
+      rescue Exception => e
+        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        raise e
       end
       
       def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false, record = nil)
-        Rails.logger.warn "Relying on @record is deprecated, call active_scaffold_render_subform_column with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
         record ||= @record # TODO Remove when relying on @record is removed
         if add_class
           col_class = []
@@ -69,7 +71,10 @@ module ActiveScaffold
           col_class = col_class.join(' ')
         end
         unless readonly and not record.new_record? or not record.authorized_for?(:crud_type => crud_type, :column => column.name)
-          render_column(column, record, column_renders_as(column), scope, false, col_class)
+          renders_as = column_renders_as(column)
+          html = render_column(column, record, renders_as, scope, false, col_class)
+          html = content_tag(:div, html, active_scaffold_subform_attributes(column)) if renders_as == :subform
+          html
         else
           options = active_scaffold_input_options(column, scope).except(:name)
           options[:class] = "#{options[:class]} #{col_class}" if col_class
@@ -77,6 +82,13 @@ module ActiveScaffold
         end
       end
 
+      def active_scaffold_subform_attributes(column, column_css_class = nil)
+        {
+          :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)
+        }
+      end
+
       # the standard active scaffold options used for textual inputs
       def active_scaffold_input_text_options(options = {})
         options[:autocomplete] = 'off'
@@ -87,9 +99,10 @@ module ActiveScaffold
       # the standard active scaffold options used for class, name and scope
       def active_scaffold_input_options(column, scope = nil, options = {})
         name = scope ? "record#{scope}[#{column.name}]" : "record[#{column.name}]"
+        record = options[:object]
 
         # Add some HTML5 attributes for in-browser validation and better user experience
-        if column.required? && (!@disable_required_for_new || scope.nil? || @record.persisted?)
+        if column.required? && (!@disable_required_for_new || scope.nil? || record.try(:persisted?))
           options[:required] = true
         end
         options[:placeholder] = column.placeholder if column.placeholder.present?
@@ -104,29 +117,34 @@ module ActiveScaffold
         { :name => name, :class => classes, :id => id_control}.merge(options)
       end
 
-      def update_columns_options(column, scope, options)
+      def current_form_columns(record, scope, subform_controller = nil)
+        if scope
+          subform_controller.active_scaffold_config.subform.columns.names
+        elsif [:new, :create, :edit, :update, :render_field].include? action_name.to_sym
+          active_scaffold_config.send(record.new_record? ? :create : :update).columns.names
+        end
+      end
+
+      def update_columns_options(column, scope, options, force = false)
         record = options[:object]
-        Rails.logger.warn "Relying on @record is deprecated, call update_columns_options with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
         record ||= @record # TODO Remove when relying on @record is removed
-        form_action = if scope
-          subform_controller = controller.class.active_scaffold_controller_for(record.class)
-          subform_controller.active_scaffold_config.subform
-        elsif [:new, :create, :edit, :update, :render_field].include? params[:action].to_sym
-          active_scaffold_config.send(record.new_record? ? :create : :update)
-        end
-        if form_action && column.update_columns && (column.update_columns & form_action.columns.names).present?
-          url_params = params_for(:action => 'render_field', :column => column.name, :id => record.id)
+        subform_controller = controller.class.active_scaffold_controller_for(record.class) if scope
+        form_columns = @main_columns.try(:names)
+        form_columns ||= current_form_columns(record, scope, subform_controller)
+        if force || (form_columns && column.update_columns && (column.update_columns & form_columns).present?)
+          url_params = params_for(:action => 'render_field', :column => column.name, :id => record.to_param)
           url_params = url_params.except(:parent_scaffold, :association, nested.param_name) if nested? && scope
           url_params[:eid] = params[:eid] if params[:eid]
           if scope
-            url_params[:parent_controller] ||= url_params[:controller]
+            url_params[:parent_controller] ||= url_params[:controller].gsub(/^\//, '')
             url_params[:controller] = subform_controller.controller_path
             url_params[:scope] = scope
             url_params[:parent_id] = params[:parent_id] || params[:id]
           end
 
           options[:class] = "#{options[:class]} update_form".strip
-          options['data-update_url'] = url_for(url_params)
+          options['data-update_url'] = url_for(url_params.merge(:_added => nil, :_removed => nil))
           options['data-update_send_form'] = column.send_form_on_update_column
           options['data-update_send_form_selector'] = column.options[:send_form_selector] if column.options[:send_form_selector]
         end
@@ -171,6 +189,10 @@ module ActiveScaffold
       def label_for(column, options)
         options[:id] unless column.form_ui == :select && column.plural_association?
       end
+
+      def subform_label(column, hidden)
+        column.label unless hidden
+      end
       
       def form_hidden_attribute(column, record, scope = nil)
         %|<dl style="display: none;"><dt></dt><dd>
@@ -178,14 +200,41 @@ module ActiveScaffold
 </dd></dl>|.html_safe
       end
 
+      # Should this column be displayed in the subform?
+      def in_subform?(column, parent_record)
+        return true unless column.association
+
+        # Polymorphic associations can't appear because they *might* be the reverse association, and because you generally don't assign an association from the polymorphic side ... I think.
+        return false if column.polymorphic_association?
+
+        # A column shouldn't be in the subform if it's the reverse association to the parent
+        return false if column.association.inverse_for?(parent_record.class)
+
+        return true
+      end
+
+      def column_show_add_existing(column, record = nil)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+        (column.allow_add_existing and options_for_association_count(column.association, record) > 0)
+      end
+
+      def column_show_add_new(column, associated, record)
+        value = (column.plural_association? && !column.readonly_association?) || column.singular_association?
+        value &&= false unless column.association.klass.authorized_for?(:crud_type => :create)
+        value
+      end
+
       ##
       ## Form input methods
       ##
       
       def active_scaffold_grouped_options(column, select_options, optgroup)
-        group_label = active_scaffold_config_for(column.association.klass).columns[optgroup].try(:association) ? :to_label : :to_s
+        group_column = active_scaffold_config_for(column.association.klass).columns[optgroup]
+        group_label = group_column.options[:label_method] if group_column
+        group_label ||= group_column.try(:association) ? :to_label : :to_s
         select_options.group_by(&optgroup.to_sym).collect do |group, options|
-          [group.send(group_label), options.collect {|r| [r.to_label, r.id]}]
+          [group.send(group_label), options.collect {|r| [r.send(column.options[:label_method] || :to_label), r.id]}]
         end
       end
 
@@ -196,41 +245,70 @@ module ActiveScaffold
       end
       
       def active_scaffold_input_singular_association(column, html_options)
-        associated = @record.send(column.association.name)
+        record = html_options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+        associated = record.send(column.association.name)
 
-        select_options = sorted_association_options_find(column.association)
+        select_options = sorted_association_options_find(column.association, nil, record)
         select_options.unshift(associated) unless associated.nil? || select_options.include?(associated)
 
         method = column.name
-        options = {:selected => associated.try(:id), :include_blank => as_(:_select_), :object => html_options.delete(:object)}
+        options = {:selected => associated.try(:id), :include_blank => as_(:_select_), :object => record}
 
-        html_options.update(column.options[:html_options] || {})
-        options.update(column.options)
+        html_options.merge!(column.options[:html_options] || {})
+        options.merge!(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)
 
-        if optgroup = options.delete(:optgroup)
+        html = if optgroup = options.delete(:optgroup)
           select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
         else
-          collection_select(:record, method, select_options, :id, :to_label, options, html_options)
+          collection_select(:record, method, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
         end
+        html << active_scaffold_refresh_link(column, html_options, record) if column.options[:refresh_link]
+        html
       end
 
-      def active_scaffold_plural_association_options(column)
-        associated_options = @record.send(column.association.name)
-        [associated_options, associated_options | sorted_association_options_find(column.association)]
+      def active_scaffold_refresh_link(column, html_options, record)
+        link_options = {:object => record}
+        if html_options['data-update_url']
+          link_options['data-update_send_form'] = html_options['data-update_send_form']
+          link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
+        else
+          scope = html_options[:name].scan(/^record((\[[^\]]*\])*)\[#{column.name}\]/)[0].try(:first) if html_options[:name]
+          link_options = update_columns_options(column, scope, link_options, true)
+        end
+        link_options[:class] = 'refresh-link'
+        link_to(as_(:refresh), link_options.delete('data-update_url') || html_options['data-update_url'], link_options)
       end
 
-      def active_scaffold_input_plural_association(column, options)
-        associated_options, select_options = active_scaffold_plural_association_options(column)
-        return content_tag(:span, as_(:no_options), :class => options[:class], :id => options[:id]) if select_options.empty?
+      def active_scaffold_plural_association_options(column, record = nil)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+        associated_options = record.send(column.association.name)
+        [associated_options, associated_options | sorted_association_options_find(column.association, nil, record)]
+      end
 
-        active_scaffold_checkbox_list(column, select_options.collect {|r| [r.to_label, r.id]}, associated_options.collect(&:id), options)
+      def active_scaffold_input_plural_association(column, options)
+        record = options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+        associated_options, select_options = active_scaffold_plural_association_options(column, record)
+        
+        html = if select_options.empty?
+          content_tag(:span, as_(:no_options), :class => "#{options[:class]} no-options", :id => options[:id])
+        else
+          method = column.options[:label_method] || :to_label
+          active_scaffold_checkbox_list(column, select_options.collect {|r| [r.send(method), r.id]}, associated_options.collect(&:id), options)
+        end
+        html << active_scaffold_refresh_link(column, options, record) if column.options[:refresh_link]
+        html
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
         html = hidden_field_tag("#{options[:name]}[]", '', :id => nil)
-        html << content_tag(:ul, :class => "#{options[:class]} checkbox-list", :id => options[:id]) do
+        html << content_tag(:ul, options.merge(:class => "#{options[:class]} checkbox-list#{' draggable-lists' if column.options[:draggable_lists]}")) do
           content = ''.html_safe
           select_options.each_with_index do |option, i|
             label, id = option
@@ -242,7 +320,7 @@ module ActiveScaffold
           end
           content
         end
-        html << javascript_tag("ActiveScaffold.draggable_lists('#{options[:id]}')") if column.options[:draggable_lists]
+        html << javascript_tag("ActiveScaffold.draggable_lists('#{options[:id]}')") if column.options[:draggable_lists] && ActiveScaffold.js_framework == :prototype
         html
       end
 
@@ -251,17 +329,20 @@ module ActiveScaffold
         [(text.is_a?(Symbol) ? column.active_record_class.human_attribute_name(text) : text), value]
       end
       
-      def active_scaffold_enum_options(column)
+      def active_scaffold_enum_options(column, record = nil)
         column.options[:options]
       end
 
       def active_scaffold_input_enum(column, html_options)
-        options = { :selected => @record.send(column.name), :object => html_options.delete(:object) }
-        options_for_select = active_scaffold_enum_options(column).collect do |text, value|
+        record = html_options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
+        options = { :selected => record.send(column.name), :object => record }
+        options_for_select = active_scaffold_enum_options(column, record).collect do |text, value|
           active_scaffold_translated_option(column, text, value)
         end
-        html_options.update(column.options[:html_options] || {})
-        options.update(column.options)
+        html_options.merge!(column.options[:html_options] || {})
+        options.merge!(column.options)
         active_scaffold_translate_select_options(options)
         select(:record, column.name, options_for_select, options, html_options)
       end
@@ -277,10 +358,21 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_radio(column, html_options)
-        html_options.update(column.options[:html_options] || {})
-        column.options[:options].inject('') do |html, (text, value)|
-          text, value = active_scaffold_translated_option(column, text, value)
-          html << content_tag(:label, radio_button(:record, column.name, value, html_options.merge(:id => html_options[:id] + '-' + value.to_s)) + text)
+        record = html_options[:object]
+        html_options.merge!(column.options[:html_options] || {})
+        options = if column.association
+          sorted_association_options_find(column.association, nil, record)
+        else
+          active_scaffold_enum_options(column, record)
+        end
+        id_key = html_options[:"data-id"] ? :"data-id" : :id
+        options.inject('') do |html, (text, value)|
+          method = column.options[:label_method] || :to_label if column.association
+          text, value = column.association ? [text.send(method), text.id] : active_scaffold_translated_option(column, text, value)
+          checked = {:checked => html_options[:object].send(column.association.name).try(:id) == value} if column.association
+          radio_options = html_options.merge(id_key => html_options[id_key] + '-' + value.to_s)
+          radio_options.merge!(checked) if checked
+          html << content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
         end.html_safe
       end
 
@@ -342,12 +434,15 @@ module ActiveScaffold
       #
 
       def active_scaffold_input_boolean(column, options)
+        record = options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         select_options = []
         select_options << [as_(:_select_), nil] if !column.virtual? && column.column.null
         select_options << [as_(:true), true]
         select_options << [as_(:false), false]
 
-        select_tag(options[:name], options_for_select(select_options, @record.send(column.name)), options)
+        select_tag(options[:name], options_for_select(select_options, record.send(column.name)), options)
       end
 
       def onsubmit
@@ -402,7 +497,7 @@ module ActiveScaffold
       ##
 
       def column_renders_as(column)
-        if column.is_a? ActiveScaffold::DataStructures::ActionColumns
+        if column.respond_to? :each
           return :subsection
         elsif column.active_record_class.locking_column.to_s == column.name.to_s or column.form_ui == :hidden
           return :hidden
@@ -414,7 +509,7 @@ module ActiveScaffold
       end
 
       def column_scope(column, scope = nil, record = nil)
-        Rails.logger.warn "Relying on @record is deprecated, call column_scope with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
         if column.plural_association?
           "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record)}]"
         else
@@ -423,13 +518,16 @@ module ActiveScaffold
       end
 
       def active_scaffold_add_existing_input(options)
+        record = options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         if ActiveScaffold.js_framework == :prototype && controller.respond_to?(:record_select_config, true)
           remote_controller = active_scaffold_controller_for(record_select_config.model).controller_path
           options.merge!(:controller => remote_controller)
           options.merge!(active_scaffold_input_text_options)
-          record_select_field(options[:name], @record, options)
+          record_select_field(options[:name], record, options)
         else
-          select_options = sorted_association_options_find(nested.association)
+          select_options = sorted_association_options_find(nested.association, nil, record)
           select_options ||= active_scaffold_config.model.all
           select_options = options_from_collection_for_select(select_options, :id, :to_label)
           select_tag 'associated_id', ('<option value="">' + as_(:_select_) + '</option>' + select_options).html_safe unless select_options.empty?

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -27,7 +27,8 @@ module ActiveScaffold
             associated = value
             associated = [associated].compact unless associated.is_a? Array
             if column.association
-              associated = column.association.klass.where(:id => associated.map(&:to_i)).collect(&:to_label)
+              method = column.options[:label_method] || :to_label
+              associated = column.association.klass.where(:id => associated.map(&:to_i)).collect(&method)
             elsif column.options[:options]
               associated = associated.collect do |value|
                 text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -10,8 +10,12 @@ module ActiveScaffold
         controller_id ||= 'as_' + id_from_controller(controller)
       end
 
+      def nested_parent_id
+        nested_parent_record.id
+      end
+
       def nested_id
-        "#{nested.parent_scaffold.controller_path}-#{nested.parent_id}-#{params[:controller]}" if nested?
+        "#{nested.parent_scaffold.controller_path}-#{nested_parent_id}-#{params[:controller]}" if nested?
       end
 
       def active_scaffold_id
@@ -58,14 +62,14 @@ module ActiveScaffold
       def element_row_id(options = {})
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{options[:controller_id] || controller_id}-#{options[:action]}-#{options[:id]}-row"
       end
 
       def element_cell_id(options = {})
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         options[:name] ||= params[:name]
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-#{options[:name]}-cell"
       end
@@ -73,7 +77,7 @@ module ActiveScaffold
       def element_form_id(options = {})
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-form"
       end
 
@@ -84,31 +88,33 @@ module ActiveScaffold
 
       def loading_indicator_id(options = {})
         options[:action] ||= params[:action]
+        options[:id] ||= params[:id]
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-loading-indicator"
       end
       
       def sub_section_id(options = {})
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:id]}-#{options[:sub_section]}-subsection"
       end
 
       def sub_form_id(options = {})
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform"
       end
       
       def sub_form_list_id(options = {})
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform-list"
       end
 
       def element_messages_id(options = {})
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
-        options[:id] ||= nested.parent_id if nested?
+        options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-messages"
       end