active_scaffold 3.3.3 → 3.4.0

data/lib/active_scaffold/bridges.rb

@@ -56,6 +56,6 @@ module ActiveScaffold
   end
 end
 
-(Dir[File.join(File.dirname(__FILE__), "bridges/*.rb")] - [__FILE__]).each{|bridge_require|
-  ActiveScaffold::Bridges.register bridge_require
-} 
+Dir[File.join(File.dirname(__FILE__), "bridges/*.rb")].each do |bridge|
+  ActiveScaffold::Bridges.register bridge unless bridge == __FILE__
+end

data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb

@@ -18,16 +18,21 @@ module ActiveScaffold::Bridges
   class Ancestry
     module FormColumnHelpers
       def active_scaffold_input_ancestry(column, options)
+        record = options[: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
+
         select_options = []
-        select_control_options = {:selected => @record.parent_id}
-        select_control_options[:include_blank] = as_(:_select_) if @record.parent_id.nil?
+        select_control_options = {:selected => record.parent_id}
+        select_control_options[:include_blank] = as_(:_select_) if record.parent_id.nil?
+        method = column.options[:label_method] || :to_label
         traverse_ancestry = proc do|key, value|
-          unless key == @record
-            select_options << ["#{'__' * key.depth}#{key.to_label}", key.id]
+          unless key == record
+            select_options << ["#{'__' * key.depth}#{key.send(method)}", key.id]
             value.each(&traverse_ancestry) if value.is_a?(Hash) && !value.empty?
           end
         end
-        @record.class.arrange.each(&traverse_ancestry)
+        record.class.arrange.each(&traverse_ancestry)
         select(:record, :ancestry, select_options, select_control_options, options)
       end
     end

data/lib/active_scaffold/bridges/cancan.rb

@@ -2,10 +2,11 @@ class ActiveScaffold::Bridges::Cancan < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), "cancan", "cancan_bridge.rb")
 
-    ActiveScaffold::ClassMethods.send :include, ActiveScaffold::Bridges::Cancan::ClassMethods
+    ActiveScaffold::Core::ClassMethods.send :include, ActiveScaffold::Bridges::Cancan::ClassMethods
     ActiveScaffold::Actions::Core.send :include, ActiveScaffold::Bridges::Cancan::Actions::Core
     ActiveScaffold::Actions::Nested.send :include, ActiveScaffold::Bridges::Cancan::Actions::Core
     ActionController::Base.send :include, ActiveScaffold::Bridges::Cancan::ModelUserAccess::Controller
+    ActionView::Base.send :include, ActiveScaffold::Bridges::Cancan::AssociationHelpers
     ::ActiveRecord::Base.send :include, ActiveScaffold::Bridges::Cancan::ModelUserAccess::Model
     ::ActiveRecord::Base.send :include, ActiveScaffold::Bridges::Cancan::ActiveRecord
   end

data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb

@@ -10,7 +10,7 @@
 module CanCan
   module Ability
     def as_action_aliases
-      alias_action :list, :row, :show_search, :render_field, :to => :read
+      alias_action :list, :show_search, :render_field, :to => :read
       alias_action :update_column, :edit_associated, :new_existing, :add_existing, :to => :update
       alias_action :delete, :destroy_existing, :to => :destroy
     end
@@ -38,6 +38,12 @@ module ActiveScaffold::Bridges
       end
     end
 
+    module AssociationHelpers
+      def association_klass_scoped(association, klass, record)
+        super.accessible_by(current_ability, :read)
+      end
+    end
+
     # beginning of chain integration
     module Actions
       module Core
@@ -73,7 +79,12 @@ module ActiveScaffold::Bridges
 
         module ClassMethods
           # The proc to call that retrieves the current_ability from the ApplicationController.
-          attr_accessor :current_ability_proc
+          def current_ability_proc
+            Thread.current[:current_ability_proc]
+          end
+          def current_ability_proc=(value)
+            Thread.current[:current_ability_proc] = value
+          end
 
           # Class-level access to the current ability
           def current_ability

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -2,8 +2,12 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
+        record = options[: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 = active_scaffold_input_text_options(options.merge(column.options))
-        carrierwave = @record.send("#{column.name}")
+
+        carrierwave = record.send("#{column.name}")
         if !carrierwave.file.blank?
 
           remove_field_options = {
@@ -17,10 +21,11 @@ module ActiveScaffold
             :id => options[:id] + '_cache'
           }
 
-          if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev('input#remove_#{options[:id]}').val('true'); $(this).parent().hide().next().show(); return false;";
-            js_dont_remove_file_code = "$(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;";
-          else
+          case ActiveScaffold.js_framework
+          when :jquery
+            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show(); return false;";
+            js_dont_remove_file_code = "jQuery(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;";
+          when :prototype
             js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;";
             js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;";
           end
@@ -28,7 +33,7 @@ module ActiveScaffold
           input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
           content_tag( :div,
             content_tag(:div, (
-                get_column_value(@record, column) + " | " +
+                get_column_value(record, column) + " | " +
                   hidden_field(:record, "#{column.name}_cache", cache_field_options) +
                   hidden_field(:record, "remove_#{column.name}", remove_field_options) +
                   content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code})

data/lib/active_scaffold/bridges/chosen/helpers.rb

@@ -13,7 +13,7 @@ class ActiveScaffold::Bridges::Chosen
         html_options[:class] << ' chosen'
         if column.plural_association?
           associated_options, select_options = active_scaffold_plural_association_options(column)
-          options = {:selected => associated_options.collect {|a| a[1]}, :include_blank => as_(:_select_)}
+          options = {:selected => associated_options.collect {|a| a.id}, :include_blank => as_(:_select_)}
 
           html_options.update(:multiple => true).update(column.options[:html_options] || {})
           options.update(column.options)
@@ -22,7 +22,7 @@ class ActiveScaffold::Bridges::Chosen
           if optgroup = options.delete(:optgroup)
             select(:record, column.name, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
           else
-            collection_select(:record, column.name, select_options, :id, :to_label, options, html_options)
+            collection_select(:record, column.name, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
           end
         else
           active_scaffold_input_select(column, html_options)

data/lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb

@@ -1,15 +1,20 @@
 module ActiveScaffold::Bridges
   class CountryHelper
     module CountryHelpers
+      def country_select_class
+        defined?(ActionView::Helpers::InstanceTag) ? ActionView::Helpers::InstanceTag : ActionView::Helpers::Tags::CountrySelect
+      end
       # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+        country_select_class.new(object, method, self, options).to_country_select_tag(priority_countries, options, html_options)
       end
 
       def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_usa_state_select_tag(priority_states, options, html_options)
+        country_select_class.new(object, method, self, options).to_usa_state_select_tag(priority_states, options, html_options)
       end
+    end
 
+    module CountryOptionsHelpers
       # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
       # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
       # that they will be listed above the rest of the (long) list.
@@ -19,7 +24,7 @@ module ActiveScaffold::Bridges
         if priority_countries
           country_options = options_for_select(priority_countries.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]} + [['-------------', '']], :selected => selected, :disabled => '')
         else
-          country_options = ""
+          country_options = options_for_select([])
         end
 
         return country_options + options_for_select(COUNTRIES.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]}, :selected => selected)
@@ -33,7 +38,7 @@ module ActiveScaffold::Bridges
         if priority_states
           state_options = options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
         else
-          state_options = ""
+          state_options = options_for_select([])
         end
 
         if priority_states && priority_states.include?(selected)
@@ -45,7 +50,7 @@ module ActiveScaffold::Bridges
         return state_options
       end
             # All the countries included in the country_options output.
-            COUNTRIES = [
+      COUNTRIES = [
       :afghanistan,                                    
       :aland_islands,                                  
       :albania,                                        
@@ -293,34 +298,32 @@ module ActiveScaffold::Bridges
       :zimbabwe] unless const_defined?("COUNTRIES")
 
 
-    	USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
-
-      class ActionView::Helpers::InstanceTag #:nodoc:
-        include CountryHelpers
+      USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
+    end
 
-        def to_country_select_tag(priority_countries, options, html_options)
-          html_options = html_options.stringify_keys
-          add_default_name_and_id(html_options)
-          value = value(object)
-          selected_value = options.has_key?(:selected) ? options[:selected] : value
-          content_tag("select",
-            add_options(
-              country_options_for_select(selected_value, priority_countries),
-              options, selected_value
-            ), html_options
-          )
-        end
+    module InstanceTagMethods
+      def to_country_select_tag(priority_countries, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        content_tag("select",
+          add_options(
+            country_options_for_select(selected_value, priority_countries),
+            options, selected_value
+          ), html_options
+        )
+      end
 
-        def to_usa_state_select_tag(priority_states, options, html_options)
-          html_options = html_options.stringify_keys
-          add_default_name_and_id(html_options)
-          value = value(object)
-          selected_value = options.has_key?(:selected) ? options[:selected] : value
-          content_tag("select", add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
-        end
+      def to_usa_state_select_tag(priority_states, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        content_tag("select", add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
       end
     end
-    
+
     module FormColumnHelpers
       def active_scaffold_input_country(column, options)
         select_options = {:prompt => as_(:_select_)}
@@ -353,6 +356,19 @@ end
 
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::CountryHelper::CountryHelpers
+  include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
   include ActiveScaffold::Bridges::CountryHelper::FormColumnHelpers
   include ActiveScaffold::Bridges::CountryHelper::SearchColumnHelpers
 end
+if defined? ActionView::Helpers::InstanceTag
+  ActionView::Helpers::InstanceTag.class_eval do
+    include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
+    include ActiveScaffold::Bridges::CountryHelper::InstanceTagMethods
+  end
+else
+  class ActionView::Helpers::Tags::CountrySelect < ActionView::Helpers::Tags::Base #:nodoc:
+    include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
+    include ActiveScaffold::Bridges::CountryHelper::InstanceTagMethods
+  end
+end
+ 

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -26,14 +26,19 @@ ActiveScaffold::Config::Core.class_eval do
   alias_method_chain :initialize, :date_picker
 end
 
-ActiveRecord::ConnectionAdapters::Column.class_eval do
-  class << self
-    def fallback_string_to_date_with_date_picker(string)
-      Date.strptime(string, I18n.t('date.formats.default')) rescue fallback_string_to_date_without_date_picker(string)
-    end
-    alias_method_chain :fallback_string_to_date, :date_picker
+module ActiveScaffold::Bridges::DatePicker::CastExtension
+  def fallback_string_to_date_with_date_picker(string)
+    Date.strptime(string, I18n.t('date.formats.default')) rescue fallback_string_to_date_without_date_picker(string)
+  end
+  def self.included(base)
+    base.alias_method_chain :fallback_string_to_date, :date_picker
   end
 end
+if defined?(ActiveRecord::ConnectionAdapters::Type)
+  ActiveRecord::ConnectionAdapters::Type::Date.send(:include, ActiveScaffold::Bridges::DatePicker::CastExtension)
+else
+  ActiveRecord::ConnectionAdapters::Column.extend ActiveScaffold::Bridges::DatePicker::CastExtension
+end
 
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::SearchColumnHelpers

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -167,9 +167,13 @@ module ActiveScaffold::Bridges
       
       module FormColumnHelpers
         def active_scaffold_input_date_picker(column, options)
+          record = options[: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 = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.form_ui.to_s}"
-          value = controller.class.condition_value_for_datetime(column, @record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
+
+          value = controller.class.condition_value_for_datetime(column, record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
           format = options.delete(:format) || (column.form_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
           options[:value] = (value ? l(value, :format => format) : nil)

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -2,17 +2,22 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_dragonfly(column, options)
+        record = options[: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 = active_scaffold_input_text_options(options.merge(column.options))
+
         input = file_field(:record, column.name, options)
-        dragonfly = @record.send("#{column.name}")
+        dragonfly = record.send("#{column.name}")
         if dragonfly.present?
-          if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
-          else
+          case ActiveScaffold.js_framework
+          when :jquery
+            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;";
+          when :prototype
             js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
           end
           
-          content = active_scaffold_column_dragonfly(@record, column)
+          content = active_scaffold_column_dragonfly(record, column)
           content_tag(:div,
             content + " | " +
               hidden_field(:record, "remove_#{column.name}", :value => "false") +

data/lib/active_scaffold/bridges/dragonfly/list_ui.rb

@@ -9,7 +9,12 @@ module ActiveScaffold
         else
           attachment.name
         end
-        link_to(content, attachment.remote_url, {'data-popup' => true, :target => '_blank'})
+        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank')
+      end
+
+      def dragonfly_url_for_attachment(attachment, record, column)
+        url_method = column.options[:private_store] ? :url : :remote_url
+        attachment.send(url_method)
       end
     end
   end

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -3,30 +3,31 @@ module ActiveScaffold
     # Helpers that assist with the rendering of a Form Column
     module FormColumnHelpers
       def active_scaffold_input_file_column(column, options)
-       if @record.send(column.name) 
+        record = options[: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
+        if record.send(column.name) 
           # we already have a value? display the form for deletion.
-          if ActiveScaffold.js_framework == :jquery
-            remove_file_js = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
-          else
+          case ActiveScaffold.js_framework
+          when :jquery
+            remove_file_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;";
+          when :prototype
             remove_file_js = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;";
           end            
           
-          hidden_options = options.dup
-          hidden_options[:id] += '_delete'
-          hidden_options[:name].sub!("[#{column.name}]", "[delete_#{column.name}]")
-          hidden_options[:value] = 'false'          
+          hidden_options = options.merge(:id => options[:id] + '_delete', :name => options[:name].sub("[#{column.name}]", "[delete_#{column.name}]"), :value => 'false')
           custom_hidden_field_tag = hidden_field(:record, column.name, hidden_options)
 
           content_tag(:div) do
             content_tag(:div) do
-              content = get_column_value(@record, column) + " #{custom_hidden_field_tag} | ".html_safe
+              content = get_column_value(record, column) + " #{custom_hidden_field_tag} | ".html_safe
               content += content_tag(:a, as_(:remove_file), {:href => '#', :onclick => remove_file_js})
               content += content_tag(:div, file_column_field("record", column.name, options), :style => "display: none")
             end           
           end
-       else
+        else
           file_column_field("record", column.name, options)          
-       end        
+        end        
       end
       
     end

data/lib/active_scaffold/bridges/paperclip/form_ui.rb

@@ -2,20 +2,28 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_paperclip(column, options)
+        record = options[: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 = active_scaffold_input_text_options(options.merge(column.options))
+
         input = file_field(:record, column.name, options)
-        paperclip = @record.send("#{column.name}")
+        paperclip = record.send("#{column.name}")
         if paperclip.file?
-          if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
-          else
+          case ActiveScaffold.js_framework
+          when :jquery
+            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;";
+          when :prototype
             js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
           end
           
-          content = active_scaffold_column_paperclip(@record, column)
+          object_name, method = options[:name].split(/\[(#{column.name})\]/)
+          method.sub!(/#{column.name}/, 'delete_\0')
+
+          content = active_scaffold_column_paperclip(record, column)
           content_tag(:div,
             content + " | " +
-              hidden_field(:record, "delete_#{column.name}", :value => "false") +
+              hidden_field(object_name, method, :value => "false") +
               content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}) 
           ) + content_tag(:div, input, :style => "display: none")
         else

data/lib/active_scaffold/bridges/paperclip/list_ui.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
         else
           paperclip.original_filename
         end
-        link_to(content, paperclip.url, {'data-popup' => true, :target => '_blank'})
+        link_to(content, paperclip.url, :target => '_blank')
       end
     end
   end

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -10,23 +10,26 @@ class ActiveScaffold::Bridges::RecordSelect
     module FormColumnHelpers
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_record_select(column, options)
+        record = 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
         if column.singular_association?
           multiple = false
           multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
-          active_scaffold_record_select(column, options, @record.send(column.name), multiple)
+          active_scaffold_record_select(record, column, options, record.send(column.name), multiple)
         elsif column.plural_association?
-          active_scaffold_record_select(column, options, @record.send(column.name), true)
+          active_scaffold_record_select(record, column, options, record.send(column.name), true)
         else
-          active_scaffold_record_select_autocomplete(column, options)
+          active_scaffold_record_select_autocomplete(record, column, options)
         end
       end
 
-      def active_scaffold_record_select(column, options, value, multiple)
+      def active_scaffold_record_select(record, column, options, value, multiple)
         unless column.association
           raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
         end
         klass = if column.polymorphic_association?
-          @record.send(column.association.foreign_type).constantize rescue nil
+          record.send(column.association.foreign_type).constantize rescue nil
         else
           column.association.klass
         end
@@ -50,16 +53,16 @@ class ActiveScaffold::Bridges::RecordSelect
         else
           record_select_field(options[:name], value || klass.new, record_select_options)
         end
-        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
         html
       end
       
-      def active_scaffold_record_select_autocomplete(column, options)
+      def active_scaffold_record_select_autocomplete(record, column, options)
         record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => active_scaffold_controller_for(@record.class).controller_path
-        )
-        html = record_select_autocomplete(options[:name], @record, record_select_options)
-        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+          :controller => active_scaffold_controller_for(record.class).controller_path
+        ).merge(column.options)
+        html = record_select_autocomplete(options[:name], record, record_select_options)
+        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
         html
       end
     end
@@ -81,7 +84,7 @@ class ActiveScaffold::Bridges::RecordSelect
             end
           end
         rescue Exception => e
-          logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
+          logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
           raise e
         end
       end