admin_assistant 2.0.1 → 2.1.0

data/lib/admin_assistant/column.rb

@@ -250,8 +250,8 @@ class AdminAssistant
       
       def datetime_range_end_point_input(form, comparator, label)
         input = "#{label} "
-        input << DateTimeRangeEndPointSelector.new(
-          form.object.send(name)[comparator],
+        input << ActionView::Helpers::DateTimeSelector.new(
+          form.object.send(name)[comparator], 
           :prefix => "search", :field_name => comparator.to_s,
           :include_position => true, :index => name, :include_blank => true,
           :datetime_separator => ' &mdash; ', :time_separator => ' : '

data/lib/admin_assistant/has_many_column.rb

@@ -14,8 +14,13 @@ class AdminAssistant
           searchable_column_comparisons = searchable_columns.map { |column|
             "LOWER(#{associated_class.table_name}.#{column.name}) like LOWER(#{sanitized_match_value})"
           }
+          foreign_key = if @has_many_assoc.respond_to?(:foreign_key)
+            @has_many_assoc.foreign_key
+          else
+            @has_many_assoc.primary_key_name
+          end
           condition_sql = <<-CONDITION_SQL
-          #{model_class.table_name}.#{model_class.primary_key} in (select #{@has_many_assoc.primary_key_name} from #{associated_class.table_name} where #{searchable_column_comparisons.join(' or ')})
+          #{model_class.table_name}.#{model_class.primary_key} in (select #{foreign_key} from #{associated_class.table_name} where #{searchable_column_comparisons.join(' or ')})
           CONDITION_SQL
           ar_query_condition.sqls << condition_sql
         end

data/lib/admin_assistant/polymorphic_belongs_to_column.rb

@@ -44,7 +44,11 @@ class AdminAssistant
     end
       
     def foreign_type_field
-      @belongs_to_assoc.options[:foreign_type]
+      if @belongs_to_assoc.respond_to?(:foreign_type)
+        @belongs_to_assoc.foreign_type
+      else
+        @belongs_to_assoc.options[:foreign_type]
+      end
     end
     
     def match_text_fields_in_search

data/lib/admin_assistant.rb

@@ -5,10 +5,9 @@ require 'will_paginate'
 require 'find'
 files = %w(
   column virtual_column active_record_column association_target
-  belongs_to_column builder date_time_range_end_point_selector 
-  default_search_column form_view has_many_column helper index init model 
-  paperclip_column polymorphic_belongs_to_column request/base 
-  request/autocomplete request/create request/destroy request/edit
+  belongs_to_column builder default_search_column form_view has_many_column 
+  helper index init model paperclip_column polymorphic_belongs_to_column 
+  request/base request/autocomplete request/create request/destroy request/edit
   request/index request/new request/show request/update route search show_view
 )
 files.each do |file|
@@ -183,7 +182,7 @@ class AdminAssistant
   module ControllerMethods
     def self.included(controller)
       controller.extend ControllerClassMethods
-      controller.class_inheritable_accessor :admin_assistant
+      controller.class_attribute :admin_assistant
     end
   end
   

data/{rails_3_test → rails_3_0}/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ../../admin_assistant
   specs:
-    admin_assistant (2.0.0)
+    admin_assistant (2.0.1)
       dynamic_form
       will_paginate (= 3.0.pre2)
 

data/{rails_3_test → rails_3_0}/config/environments/development.rb

@@ -11,7 +11,6 @@ Rails3Test::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/rails_3_0/config/routes.rb

@@ -0,0 +1,8 @@
+Rails3Test::Application.routes.draw do
+  namespace :admin do
+    resources :comments
+    resources :users
+  end
+  
+  resources :blog_posts
+end

data/{rails_3_test → rails_3_0}/test/integration/admin/blog_posts2_integration_test.rb

@@ -324,7 +324,7 @@ class Admin::BlogPosts2IntegrationTest < ActionController::IntegrationTest
         assert_select("option[value=?]", @user.id)
       end
     end
-    
+
     # should show a link to /admin/comments/new
     assert_select('td') do
       assert_select(
@@ -632,7 +632,7 @@ class Admin::BlogPosts2IntegrationTest < ActionController::IntegrationTest
     get "/admin/blog_posts2"
     
     # should show link to page 2
-    assert_select("a[href=/admin/blog_posts2?page=2]")
+    assert_will_paginate_link("/admin/blog_posts2", 2)
     
     # should say 11 blog posts found
     assert_match(/11 blog posts found/, response.body)

data/{rails_3_test → rails_3_0}/test/integration/admin/blog_posts_integration_test.rb

@@ -495,10 +495,8 @@ class Admin::BlogPostsIntegrationTest < ActionController::IntegrationTest
     assert_response :success
       
     # should have a link to the next page
-    assert_select(
-      "a[href=/admin/blog_posts?page=2]", 'Next &#8594;'
-    )
-    assert_select("a[href=/admin/blog_posts?page=2]", '2')
+    assert_will_paginate_link("/admin/blog_posts", 2, 'Next &#8594;')
+    assert_will_paginate_link("/admin/blog_posts", 2, '2')
       
     # should not have a link to the previous page
     assert_select(
@@ -522,16 +520,12 @@ class Admin::BlogPostsIntegrationTest < ActionController::IntegrationTest
     assert_response :success
   
     # should have a link to the next page
-    assert_select(
-      "a[href=/admin/blog_posts?page=3]", 'Next &#8594;'
-    )
-    assert_select("a[href=/admin/blog_posts?page=3]", '3')
+    assert_will_paginate_link("/admin/blog_posts", 3, 'Next &#8594;')
+    assert_will_paginate_link("/admin/blog_posts", 3, '3')
   
     # should have a link to the previous page
-    assert_select(
-      "a[href=/admin/blog_posts?page=1]", '&#8592; Previous'
-    )
-    assert_select("a[href=/admin/blog_posts?page=1]", '1')
+    assert_will_paginate_link("/admin/blog_posts", 1, '&#8592; Previous')
+    assert_will_paginate_link("/admin/blog_posts", 1, '1')
   
     # should the full number of posts found
     assert_match(/51 blog posts found/, response.body)
@@ -555,10 +549,8 @@ class Admin::BlogPostsIntegrationTest < ActionController::IntegrationTest
     assert_select("a[href=/admin/blog_posts?page=3]", false, '3')
   
     # should have a link to the previous page
-    assert_select(
-      "a[href=/admin/blog_posts?page=2]", '&#8592; Previous'
-    )
-    assert_select("a[href=/admin/blog_posts?page=2]", '2')
+    assert_will_paginate_link("/admin/blog_posts", 2, '&#8592; Previous')
+    assert_will_paginate_link("/admin/blog_posts", 2, '2')
   
     # should the full number of posts found
     assert_match(/51 blog posts found/, response.body)