active_scaffold 3.2.16 → 3.2.17

data/CHANGELOG

@@ -1,3 +1,15 @@
+= 3.2.17 (not released yet)
+- fix constraints for columns with multiple columns in search_sql
+- remove unauthorized collection links
+- copy parameters and html_options on cloning action link
+- fix missing argument in datepicker conditions
+- check authorization in model for plural associations nested links
+- Allow to set action_group in nested.add_link
+- fix current page when is inside outer window
+- Support record select with polymorphic associations
+- Fix column count in inline adapter for forms and views
+- Add support for class prefix on human condition helpers
+
 = 3.2.16
 - Fix use of column.css_class in form when is a proc, it wasn't skipped when form was a columns group
 - Fix constraints and colspan in self-referential associations

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

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

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

@@ -53,7 +53,7 @@ ActiveScaffold::Finder::ClassMethods.module_eval do
     if column.search_ui == :date_picker
       :to_date
     else
-      datetime_conversion_for_condition_without_datepicker
+      datetime_conversion_for_condition_without_datepicker(column)
     end
   end
   alias_method_chain :datetime_conversion_for_condition, :datepicker

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

@@ -25,7 +25,14 @@ class ActiveScaffold::Bridges::RecordSelect
         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
-        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
+        klass = if column.polymorphic_association?
+          @record.send(column.association.foreign_type).constantize rescue nil
+        else
+          column.association.klass
+        end
+        return content_tag :span, '', :class => options[:class] unless klass
+
+        remote_controller = active_scaffold_controller_for(klass).controller_path
 
         # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
         # then only show records that have not been associated yet
@@ -41,7 +48,7 @@ class ActiveScaffold::Bridges::RecordSelect
         html = if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
         else
-          record_select_field(options[:name], value || column.association.klass.new, record_select_options)
+          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

data/lib/active_scaffold/config/nested.rb

@@ -21,12 +21,13 @@ module ActiveScaffold::Config
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
       unless column.nil? || column.association.nil?
-        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize})
+        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize})
+        action_group = options.delete(:action_group) || self.action_group
         action_link = @core.link_for_association(column, options)
         action_link.action ||= :index
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
       else
-        
+        # TODO: raise exception
       end
     end
     

data/lib/active_scaffold/constraints.rb

@@ -17,7 +17,7 @@ module ActiveScaffold
       constrained_fields |= active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect(&:to_sym)
       exclude_actions = []
       [:list, :update].each do |action_name|
-	if active_scaffold_config.actions.include? action_name
+        if active_scaffold_config.actions.include? action_name
           exclude_actions << action_name unless active_scaffold_config.send(action_name).hide_nested_column
         end
       end
@@ -70,7 +70,7 @@ module ActiveScaffold
           # regular column constraints
           elsif column.searchable? && params[column.name] != v
             active_scaffold_includes.concat column.includes
-            conditions << ["#{column.search_sql} = ?", v]
+            conditions << [column.search_sql.collect { |search_sql| "#{search_sql} = ?" }.join(' OR '), *([v] * column.search_sql.size)]
           end
         # unknown-to-activescaffold-but-real-database-column constraint
         elsif active_scaffold_config.model.columns_hash[k.to_s] && params[column.name] != v

data/lib/active_scaffold/data_structures/action_links.rb

@@ -127,6 +127,7 @@ module ActiveScaffold::DataStructures
           else
             options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
           end
+          next unless authorized || link.type == :member
           yield(self, link, {:authorized => authorized, :first_action => first_action, :level => options[:level]})
           first_action = false
         end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -45,14 +45,11 @@ module ActiveScaffold
         end unless value.nil?
       end
 
-      def override_human_condition_column?(column)
-        respond_to?(override_human_condition_column(column))
-      end
-
       # the naming convention for overriding form fields with helpers
       def override_human_condition_column(column)
-        "#{column.name}_human_condition_column"
+        override_helper column, 'human_condition_column'
       end
+      alias_method :override_human_condition_column?, :override_human_condition_column
 
       def override_human_condition?(search_ui)
         respond_to?(override_human_condition(search_ui))

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -97,11 +97,8 @@ module ActiveScaffold
 
       def column_link_authorized?(link, column, record, associated)
         if column.association
-          associated_for_authorized = if associated.nil? || (column.plural_association? && !associated.loaded?) || (associated.respond_to?(:blank?) && associated.blank?)
+          associated_for_authorized = if column.plural_association? || (associated.respond_to?(:blank?) && associated.blank?)
             column.association.klass
-          elsif [:has_many, :has_and_belongs_to_many].include? column.association.macro
-            # may be cached with [] or [nil] to avoid some queries
-            associated.first || column.association.klass
           else
             associated
           end

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -16,10 +16,14 @@ module ActiveScaffold
         end
 
         html = []
-        last_page = 1
-        last_page.upto(last_page + outer_window) do |num|
-          html << pagination_ajax_link(num, url_options, options)
-          last_page = num
+        if current_page.number == 1
+          last_page = 0
+        else
+          last_page = 1
+          last_page.upto([last_page + outer_window, current_page.number - 1].min) do |num|
+            html << pagination_ajax_link(num, url_options, options)
+            last_page = num
+          end
         end
         if current_page.pager.infinite?
           offsets.reverse.each do |offset|

data/lib/active_scaffold/version.rb

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

metadata

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