active_scaffold 3.0.26 → 3.1.3

data/lib/active_scaffold/finder.rb~

@@ -108,18 +108,11 @@ module ActiveScaffold
       
       def condition_value_for_datetime(value, conversion = :to_time)
         if value.is_a? Hash
-          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
+          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[field][part].to_i}) rescue nil
         elsif value.respond_to?(:strftime)
           value.send(conversion)
-        elsif conversion == :to_date
-          Date.strptime(value, I18n.t('date.formats.default')) rescue nil
         else
-          parts = Date._parse(value)
-          time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
-          format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
-          time = DateTime.strptime(value, format)
-          time = Time.zone.local_to_utc(time) unless parts[:offset]
-          time.in_time_zone.send(conversion) rescue nil
+          Time.zone.parse(value).in_time_zone.send(conversion) rescue nil
         end unless value.nil? || value.blank?
       end
 
@@ -277,7 +270,7 @@ module ActiveScaffold
     # Returns a hash with options to count records, rejecting select and order options
     # See finder_options for valid options
     def count_options(find_options = {}, count_includes = nil)
-      count_includes ||= find_options[:includes] unless find_options[:where].nil?
+      count_includes ||= find_options[:includes] unless find_options[:conditions].nil?
       options = find_options.reject{|k,v| [:select, :order].include? k}
       options[:includes] = count_includes
       options
@@ -296,7 +289,6 @@ module ActiveScaffold
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       if options[:pagination] && options[:pagination] != :infinite
         count_query = append_to_query(klass, count_options(find_options, options[:count_includes]))
-        debugger
         count = count_query.count unless options[:pagination] == :infinite
       end
   

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -31,7 +31,7 @@ module ActiveScaffold
         case association.macro
           when :has_one, :has_many
             # Find only orphaned objects
-            "#{association.primary_key_name} IS NULL"
+            "#{association.foreign_key} IS NULL"
           when :belongs_to, :has_and_belongs_to_many
             # Find all
             nil

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?}
+        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated}
       end
       
       include ActiveScaffold::Helpers::IdHelpers
@@ -82,6 +82,14 @@ module ActiveScaffold
         end if @parent_action.nil?
         @parent_action
       end
+      
+      def build_associated(column, record)
+        if column.singular_association?
+          record.send(:"build_#{column.name}")
+        else
+          record.send(column.name).build
+        end
+      end
     end
   end
 end

data/lib/active_scaffold/helpers/controller_helpers.rb~

@@ -33,7 +33,8 @@ module ActiveScaffold
             parameters[:eid] = params[:parent_controller]
           end
           if nested?
-            parameters.merge! nested.to_params
+            parameters[:controller] = nested.parent_scaffold.controller_path
+            parameters[:eid] = nil
           end
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
@@ -83,11 +84,17 @@ module ActiveScaffold
       end
       
       def build_associated(column, record)
-        if column.singular_association?
-          record.send(:"build_#{column.name}")
-        else
-          record.send(column.name).build
+        child = column.singular_association? ? record.send(:"build_#{column.name}") : record.send(column.name).build
+        if record.new_record? && (reflection = record.class.reflect_on_association(column.name)).try(:reverse)
+          reverse_macro = child.class.reflect_on_association(reflection.reverse).macro
+          if [:has_one, :belongs_to].include?(reverse_macro) # singular
+            child.send(:"#{reflection.reverse}=", record)
+          # TODO: Might want to extend with this branch in the future
+          # else # plural
+          #  child.send(:"#{reflection.reverse}") << record
+          end
         end
+        child
       end
     end
   end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -72,7 +72,7 @@ module ActiveScaffold
 
         # Fix for keeping unique IDs in subform
         id_control = "record_#{column.name}_#{[params[:eid], params[:id]].compact.join '_'}"
-        id_control += scope.gsub(/(\[|\])/, '_').gsub('__', '_').gsub(/_$/, '') if scope
+        id_control += scope_id(scope) if scope
 
         { :name => name, :class => "#{column.name}-input", :id => id_control}.merge(options)
       end
@@ -102,10 +102,9 @@ module ActiveScaffold
         select_options = options_for_association(column.association)
         select_options.unshift([ associated.to_label, associated.id ]) unless associated.nil? or select_options.find {|label, id| id == associated.id}
 
-        selected = associated.nil? ? nil : associated.id
         method = column.name
         #html_options[:name] += '[id]'
-        options = {:selected => selected, :include_blank => as_(:_select_)}
+        options = {:selected => associated.try(:id), :include_blank => as_(:_select_)}
 
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
@@ -116,25 +115,26 @@ module ActiveScaffold
       def active_scaffold_input_plural_association(column, options)
         associated_options = @record.send(column.association.name).collect {|r| [r.to_label, r.id]}
         select_options = associated_options | options_for_association(column.association)
-        return content_tag(:span, as_(:no_options), :id => options[:id]) if select_options.empty?
+        return content_tag(:span, as_(:no_options), :class => options[:class], :id => options[:id]) if select_options.empty?
 
         active_scaffold_checkbox_list(column, select_options, associated_options.collect {|a| a[1]}, options)
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
-        html = "<ul class=\"checkbox-list\" id=\"#{options[:id]}\">"
-        
-        select_options.each_with_index do |option, i|
-          label, id = option
-          this_id = "#{options[:id]}_#{i}_id"
-          html << content_tag(:li) do 
-            check_box_tag("#{options[:name]}[]", id, associated_ids.include?(id), :id => this_id) <<
-            content_tag(:label, h(label), :for => this_id)
+        html = content_tag :ul, :class => "#{options[:class]} checkbox-list", :id => options[:id] do
+          content = "".html_safe
+          select_options.each_with_index do |option, i|
+            label, id = option
+            this_id = "#{options[:id]}_#{i}_id"
+            content << content_tag(:li) do 
+              check_box_tag("#{options[:name]}[]", id, associated_ids.include?(id), :id => this_id) <<
+              content_tag(:label, h(label), :for => this_id)
+            end
           end
+          content
         end
-        html << '</ul>'
         html << javascript_tag("new DraggableLists('#{options[:id]}')") if column.options[:draggable_lists]
-        html.html_safe
+        html
       end
 
       def active_scaffold_translated_option(column, text, value = nil)
@@ -171,7 +171,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_checkbox(column, options)
-        check_box(:record, column.name, options)
+        check_box(:record, column.name, options.merge(column.options))
       end
 
       def active_scaffold_input_password(column, options)
@@ -210,8 +210,7 @@ module ActiveScaffold
 
       # add functionality for overriding subform partials from association class path
       def override_subform_partial?(column, subform_partial)
-        path, partial_name = partial_pieces(override_subform_partial(column, subform_partial))
-        template_exists?(partial_name, path, true)
+        template_exists?(override_subform_partial(column, subform_partial), true)
       end
 
       def override_subform_partial(column, subform_partial)
@@ -219,13 +218,13 @@ module ActiveScaffold
       end
 
       def override_form_field_partial?(column)
-        path, partial_name = partial_pieces(override_form_field_partial(column))
-        template_exists?(partial_name, path, true)
+        template_exists?(override_form_field_partial(column), true)
       end
 
-      # the naming convention for overriding form fields with partials
+      # the naming convention for overriding form fields with helpers
       def override_form_field_partial(column)
-        "#{column.name}_form_column"
+        path = active_scaffold_controller_for(column.active_record_class).controller_path
+        File.join(path, "#{clean_column_name(column.name)}_form_column")
       end
 
       def override_form_field(column)

data/lib/active_scaffold/helpers/form_column_helpers.rb~

@@ -121,7 +121,8 @@ module ActiveScaffold
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
-        html = content_tag :ul, :class => "#{options[:class]} checkbox-list", :id => options[:id] do
+        options[:class] << " checkbox-list"
+        html = content_tag :ul, :class => options[:class], :id => options[:id] do
           content = "".html_safe
           select_options.each_with_index do |option, i|
             label, id = option

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -3,7 +3,7 @@ module ActiveScaffold
     # A bunch of helper methods to produce the common view ids
     module IdHelpers
       def id_from_controller(controller)
-        controller.to_s.gsub("/", "__")
+        controller.to_s.gsub("/", "__").html_safe
       end
 
       def controller_id(controller = (params[:eid] || params[:parent_controller] || params[:controller]))
@@ -42,10 +42,6 @@ module ActiveScaffold
         "#{controller_id}-search-input"
       end
 
-      def table_action_id(name)
-        "#{controller_id}-action-table-#{name}"
-      end
-
       def action_link_id(link_action,link_id)
         "#{controller_id}-#{link_action}-#{link_id}-link"
       end
@@ -115,6 +111,10 @@ module ActiveScaffold
       def action_iframe_id(options)
         "#{controller_id}-#{options[:action]}-#{options[:id]}-iframe"
       end
+      
+      def scope_id(scope)
+        scope.gsub(/(\[|\])/, '_').gsub('__', '_').gsub(/_$/, '')
+      end
 
       private
 

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -34,14 +34,13 @@ module ActiveScaffold
         if column.link
           link = column.link
           associated = record.send(column.association.name) if column.association
-          url_options = params_for(:action => nil, :id => record.id)
+          url_options = params_for(:action => nil, :id => record.id, :link => text)
 
           # setup automatic link
           if column.autolink? && column.singular_association? # link to inline form
-            link = action_link_to_inline_form(column, record, associated, text)
-            return text if link.nil?
-          else
-            url_options[:link] = text
+            link = action_link_to_inline_form(column, record, associated)
+            return text if link.crud_type.nil?
+            url_options[:link] = as_(:create_new) if link.crud_type == :create
           end
 
           if column_link_authorized?(link, column, record, associated)
@@ -56,9 +55,8 @@ module ActiveScaffold
       end
 
       # setup the action link to inline form
-      def action_link_to_inline_form(column, record, associated, text)
+      def action_link_to_inline_form(column, record, associated)
         link = column.link.clone
-        link.label = text
         if column.polymorphic_association?
           polymorphic_controller = controller_path_for_activerecord(record.send(column.association.name).class)
           return link if polymorphic_controller.nil?
@@ -72,7 +70,6 @@ module ActiveScaffold
           if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
-            link.label = as_(:create_new)
           end
         elsif actions.include?(:edit)
           link.action = 'edit'
@@ -84,7 +81,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link if link.action.present?
+        link
       end
 
       def column_link_authorized?(link, column, record, associated)
@@ -122,17 +119,6 @@ module ActiveScaffold
         truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
       end
 
-      def active_scaffold_column_select(column, record)
-        if column.association
-          format_column_value(record, column)
-        else
-          value = record.send(column.name)
-          text, val = column.options[:options].find {|text, val| (val || text).to_s == value}
-          value = active_scaffold_translated_option(column, text, val).first if text
-          format_column_value(record, column, value)
-        end
-      end
-
       def active_scaffold_column_checkbox(column, record)
         options = {:disabled => true, :id => nil, :object => record}
         options.delete(:disabled) if inplace_edit?(record, column)
@@ -167,9 +153,13 @@ module ActiveScaffold
         value ||= record.send(column.name) unless record.nil?
         if value && column.association # cache association size before calling column_empty?
           associated_size = value.size if column.plural_association? and column.associated_number? # get count before cache association
-          cache_association(value, column)
+          cache_association(value, column) if column.plural_association?
         end
         if column.association.nil? or column_empty?(value)
+          if column.form_ui == :select && column.options[:options]
+            text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
+            value = active_scaffold_translated_option(column, text, val).first if text
+          end
           if value.is_a? Numeric
             format_number_value(value, column.options)
           else
@@ -189,7 +179,7 @@ module ActiveScaffold
           when :currency
             number_to_currency(value, options[:i18n_options] || {})
           when :i18n_number
-            send("number_with_#{value.is_a?(Integer) ? 'delimiter' : 'precision'}", value, options[:i18n_options] || {})
+            number_with_delimiter(value, options[:i18n_options] || {})
           else
             value
         end
@@ -206,10 +196,10 @@ module ActiveScaffold
             end
           when :has_many, :has_and_belongs_to_many
             if column.associated_limit.nil?
-              firsts = value.collect { |v| v.to_label }
+              firsts = value.collect { |v| clean_column_value(v.to_label) }
             else
               firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| v.to_label }
+              firsts.collect! { |v| clean_column_value(v.to_label) }
               firsts[column.associated_limit] = '…' if value.size > column.associated_limit
             end
             if column.associated_limit == 0

data/lib/active_scaffold/helpers/list_column_helpers.rb~

@@ -34,14 +34,13 @@ module ActiveScaffold
         if column.link
           link = column.link
           associated = record.send(column.association.name) if column.association
-          url_options = params_for(:action => nil, :id => record.id)
+          url_options = params_for(:action => nil, :id => record.id, :link => text)
 
           # setup automatic link
           if column.autolink? && column.singular_association? # link to inline form
-            link = action_link_to_inline_form(column, record, associated, text)
-            return text if link.nil?
-          else
-            url_options[:link] = text
+            link = action_link_to_inline_form(column, record, associated)
+            return text if link.crud_type.nil?
+            url_options[:link] = as_(:create_new) if link.crud_type == :create
           end
 
           if column_link_authorized?(link, column, record, associated)
@@ -56,9 +55,8 @@ module ActiveScaffold
       end
 
       # setup the action link to inline form
-      def action_link_to_inline_form(column, record, associated, text)
+      def action_link_to_inline_form(column, record, associated)
         link = column.link.clone
-        link.label = text
         if column.polymorphic_association?
           polymorphic_controller = controller_path_for_activerecord(record.send(column.association.name).class)
           return link if polymorphic_controller.nil?
@@ -72,7 +70,6 @@ module ActiveScaffold
           if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
-            link.label = as_(:create_new)
           end
         elsif actions.include?(:edit)
           link.action = 'edit'
@@ -84,7 +81,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link if link.action.present?
+        link
       end
 
       def column_link_authorized?(link, column, record, associated)
@@ -119,7 +116,7 @@ module ActiveScaffold
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
+        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
       end
 
       def active_scaffold_column_checkbox(column, record)
@@ -190,25 +187,25 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        format_value case column.association.macro
+        case column.association.macro
           when :has_one, :belongs_to
             if column.polymorphic_association?
-              "#{value.class.model_name.human}: #{value.to_label}"
+              format_value("#{value.class.model_name.human}: #{value.to_label}")
             else
-              value.to_label
+              format_value(value.to_label)
             end
           when :has_many, :has_and_belongs_to_many
             if column.associated_limit.nil?
-              firsts = value.collect { |v| v.to_label }
+              firsts = value.collect { |v| clean_column_value(v.to_label) }
             else
               firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| v.to_label }
+              firsts.collect! { |v| clean_column_value(v.to_label) }
               firsts[column.associated_limit] = '…' if value.size > column.associated_limit
             end
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
+              joined_associated = format_value(firsts.join(active_scaffold_config.list.association_join_text))
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end
@@ -275,13 +272,11 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          old_record, @record = @record, new_model
+          @record = new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
-            @record = old_record
-          end
+          content_tag(:div, active_scaffold_input_for(column), {:style => "display:none;", :class => inplace_edit_control_css_class})
         end
       end
 

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -74,7 +74,7 @@ module ActiveScaffold
         associated = html_options.delete :value
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
-          method = column.association.macro == :belongs_to ? column.association.primary_key_name : column.name
+          method = column.association.macro == :belongs_to ? column.association.foreign_key : column.name
           select_options = options_for_association(column.association, true)
         else
           method = column.name
@@ -146,6 +146,15 @@ module ActiveScaffold
         select_options
       end
 
+      def include_null_comparators?(column)
+        return column.options[:null_comparators] if column.options.has_key? :null_comparators
+        if column.association
+          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association.primary_key_name].column.try(:null)
+        else
+          column.column.try(:null)
+        end
+      end
+
       def active_scaffold_search_range(column, options)
         opt_value, from_value, to_value = field_search_params_range_values(column)