typus 3.0.11.rc4 → 3.0.11.rc5

data/app/helpers/admin/relationships_helper.rb

@@ -17,7 +17,7 @@ module Admin
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
+        form = if Typus.autocomplete
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -50,7 +50,7 @@ module Admin
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
+        form = if Typus.autocomplete
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -161,21 +161,19 @@ module Admin
         message = link_to Typus::I18n.t("Add new"), options
       end
 
-      # Set the template.
-      template = if Typus.autocomplete && (related.respond_to?(:roots) || !(related.count > Typus.autocomplete))
-                   "admin/templates/belongs_to"
-                 else
-                   "admin/templates/belongs_to_with_autocomplete"
-                 end
-
-      # Set the values.
-      values = if related.respond_to?(:roots)
-                 expand_tree_into_select_field(related.roots, related_fk)
-               elsif Typus.autocomplete && !(related.count > Typus.autocomplete)
-                 related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
-               end
+      # By default the used template is ALWAYS `belongs_to` unless we have the
+      # `Typus.autocomplete` feature enabled.
+      template = Typus.autocomplete ? "belongs_to_with_autocomplete" : "belongs_to"
+
+      # If `Typus.autocomplete` is enabled we don't set the values as will be
+      # autocompleted.
+      if related.respond_to?(:roots)
+        values = expand_tree_into_select_field(related.roots, related_fk)
+      elsif !Typus.autocomplete
+        values = related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
+      end
 
-      render template,
+      render "admin/templates/#{template}",
              :association => association,
              :resource => @resource,
              :attribute => attribute,

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.11.rc4"
+  VERSION = "3.0.11.rc5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.0.11.rc4
+  version: 3.0.11.rc5
   prerelease: 7
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-27 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2154164760 !ruby/object:Gem::Requirement
+  requirement: &2153866820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154164760
+  version_requirements: *2153866820
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &2154163540 !ruby/object:Gem::Requirement
+  requirement: &2153866300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2154163540
+  version_requirements: *2153866300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154162160 !ruby/object:Gem::Requirement
+  requirement: &2153865800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 3.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2154162160
+  version_requirements: *2153865800
 - !ruby/object:Gem::Dependency
   name: render_inheritable
-  requirement: &2154161560 !ruby/object:Gem::Requirement
+  requirement: &2153865420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154161560
+  version_requirements: *2153865420
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2154160520 !ruby/object:Gem::Requirement
+  requirement: &2153864880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +65,7 @@ dependencies:
         version: 3.0.pre2
   type: :runtime
   prerelease: false
-  version_requirements: *2154160520
+  version_requirements: *2153864880
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -481,7 +480,6 @@ files:
 - test/lib/typus_test.rb
 - test/test_helper.rb
 - typus.gemspec
-has_rdoc: true
 homepage: http://core.typuscms.com/
 licenses: []
 post_install_message: 
@@ -502,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold