typus 3.0.0 → 3.0.1

data/app/helpers/admin/relationships_helper.rb

@@ -23,6 +23,8 @@ module Admin
 
       options = { foreign_key => @item.id }
 
+      build_pagination
+
       render "admin/templates/has_n",
              :model_to_relate => @model_to_relate,
              :model_to_relate_as_resource => @model_to_relate_as_resource,
@@ -42,6 +44,8 @@ module Admin
         form = build_relate_form
       end
 
+      build_pagination
+
       render "admin/templates/has_n",
              :model_to_relate => @model_to_relate,
              :model_to_relate_as_resource => @model_to_relate_as_resource,
@@ -51,6 +55,13 @@ module Admin
 
     end
 
+    def build_pagination
+      options = { :order => @model_to_relate.typus_order_by, :conditions => set_conditions }
+      items_per_page = @model_to_relate.typus_options_for(:per_page)
+      data = @resource.find(params[:id]).send(@field).all(options)
+      @items = data.paginate(:per_page => items_per_page, :page => params[:page])
+    end
+
     def build_relate_form
       render "admin/templates/relate_form",
              :model_to_relate => @model_to_relate,

data/config/available_locales/fr.yml

@@ -31,6 +31,7 @@ fr:
   "Edit %{resource}": "Éditer %{resource}"
   "Enter your email below to create the first user": "Entrez votre adresse email pour créer le premier utilisateur"
   "Error! Typus User or role doesn't exist": "Une erreur est survenue. L'utilisateur ou le rôle sont inconnus."
+  "Export as %{format}": "Exporter en %{format}"
 
   "False": "Faux"
   "Filter": "Filtrer"
@@ -75,6 +76,7 @@ fr:
   "Setup": "Configurer"
   "Show": "Voir"
   "Show %{resource}": "Voir %{resource}"
+  "Show by %{attribute}": "Afficher par %{attribute}"
   "Sign in": "Entrer"
   "Sign out": "Déconnexion"
   "Sign up": "Ouvrir un compte"

data/lib/typus/orm/active_record.rb

@@ -248,7 +248,7 @@ module Typus
                      when "^" then "#{query}%"
                      when "@" then "%#{query}%"
                      end
-            key = "TEXT(#{key})" if adapter == 'postgresql'
+            key = "LOWER(TEXT(#{key}))" if adapter == 'postgresql'
             search << "#{key} LIKE '#{_query}'"
           end
           conditions = merge_conditions(conditions, search.join(" OR "))

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -390,7 +390,6 @@ files:
 - test/unit/admin/mailer_test.rb
 - test/unit/typus_user_roles_test.rb
 - test/unit/typus_user_test.rb
-- typus-1.0.0.pre14.gem
 - typus.gemspec
 has_rdoc: true
 homepage: http://core.typuscms.com/