activeadmin 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563d1b0d5a864fbade2689270fb82575242d8c557f4c4807e45d5fb6d3679ccb
-  data.tar.gz: 0076ad12634d0c8762697204639d0ce9447f051fd4b6827da3a09e4fdf7dcb1b
+  metadata.gz: ddd5ccf937ae176b3ba0e13d2af256758dbde0c4aafe9b966c752bb1bb411ea8
+  data.tar.gz: fa4bbd86cf444fb150d6cd624ed8a3125144481878001de32461f5256e30b835
 SHA512:
-  metadata.gz: 7cdc8ddd8ba6452996a80f098cde70512a83215c4731d03b7a0b0a9d601f5886c12f5db824be5aaf0ecb92a8151f0685ad65f95d1c7f623767613f4a46e29617
-  data.tar.gz: 7b14dc13a08928a73f48bfcd4972d20b4a2d33db3c29afb1769ab63c3654cbe6e711e6ff8f39b4b131af6c94c060ac6b5056abb6494cafc4b6c3a13f99bbb7db
+  metadata.gz: 84c708ca4b0aa8580a3181de153dd698f39c427e9c28adca8c7b3d1f75ff09ba41fa9955d84c6eeb3beccd174db2147a54980123302093cb0d51dd22a021ff40
+  data.tar.gz: 95fc6f7f92134b18270a2ccfdb05c1c55e9151bde9390bbd752f3735633f494c4145674534c1f2bc964687dc513aeb925a5427c8678ea3380340b89859431ebe

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 2.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.1..v2.4.0)
+
+### Enhancements
+
+* Make optimization to not use expensive COUNT queries also work for decorated actions. [#5811] by [@irmela]
+* Render a text filter instead of a select for large associations (opt-in) [#5548] by [@DanielHeath]
+* Improve German translations [#5874] by [@juril33t]
+
 ## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
 
 ### Bug Fixes
@@ -499,12 +507,15 @@ Please check [0-6-stable] for previous changes.
 [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
 [#5801]: https://github.com/activeadmin/activeadmin/pull/5801
 [#5802]: https://github.com/activeadmin/activeadmin/pull/5802
+[#5811]: https://github.com/activeadmin/activeadmin/pull/5811
 [#5816]: https://github.com/activeadmin/activeadmin/pull/5816
 [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
 [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
 [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
+[#5548]: https://github.com/activeadmin/activeadmin/pull/5548
 [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
 [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
+[#5874]: https://github.com/activeadmin/activeadmin/pull/5874
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -513,10 +524,12 @@ Please check [0-6-stable] for previous changes.
 [@amiel]: https://github.com/amiel
 [@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
+[@bartoszkopinski]: https://github.com/bartoszkopinski
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
 [@buren]: https://github.com/buren
 [@chancancode]: https://github.com/chancancode
+[@chrp]: https://github.com/chrp
 [@chumakoff]: https://github.com/chumakoff
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
@@ -535,19 +548,25 @@ Please check [0-6-stable] for previous changes.
 [@HappyKadaver]: https://github.com/HappyKadaver
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
+[@irmela]: https://github.com/irmela
 [@jasl]: https://github.com/jasl
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
 [@JiiHu]: https://github.com/JiiHu
 [@johnnyshields]: https://github.com/johnnyshields
+[@jscheid]: https://github.com/jscheid
+[@juril33t]: https://github.com/juril33t
 [@kjeldahl]: https://github.com/kjeldahl
 [@kobeumut]: https://github.com/kobeumut
+[@Kris-LIBIS]: https://github.com/Kris-LIBIS
 [@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
+[@ndbroadbent]: https://github.com/ndbroadbent
 [@Nguyenanh]: https://github.com/Nguyenanh
+[@panasyuk]: https://github.com/panasyuk
 [@PChambino]: https://github.com/PChambino
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
@@ -555,6 +574,7 @@ Please check [0-6-stable] for previous changes.
 [@RobinvanderVliet]: https://github.com/RobinvanderVliet
 [@rogerkk]: https://github.com/rogerkk
 [@seanlinsley]: https://github.com/seanlinsley
+[@sgara]: https://github.com/sgara
 [@ShallmentMo]: https://github.com/ShallmentMo
 [@shekibobo]: https://github.com/shekibobo
 [@shouya]: https://github.com/shouya
@@ -564,16 +584,9 @@ Please check [0-6-stable] for previous changes.
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
-[@wasifhossain]: https://github.com/wasifhossain
+[@violeta-p]: https://github.com/violeta-p
 [@WaKeMaTTa]: https://github.com/WaKeMaTTa
+[@wasifhossain]: https://github.com/wasifhossain
 [@Wowu]: https://github.com/Wowu
 [@wspurgin]: https://github.com/wspurgin
 [@zorab47]: https://github.com/zorab47
-[@chrp]: https://github.com/chrp
-[@bartoszkopinski]: https://github.com/bartoszkopinski
-[@panasyuk]: https://github.com/panasyuk
-[@jscheid]: https://github.com/jscheid
-[@violeta-p]: https://github.com/violeta-p
-[@ndbroadbent]: https://github.com/ndbroadbent
-[@Kris-LIBIS]: https://github.com/Kris-LIBIS
-[@sgara]: https://github.com/sgara

data/config/locales/de.yml

@@ -1,4 +1,20 @@
 de:
+  activerecord:
+    models:
+      comment:
+        one: "Kommentar"
+        other: "Kommentare"
+      active_admin/comment:
+        one: "Kommentar"
+        other: "Kommentare"
+    attributes:
+      active_admin/comment:
+        author_type: "Autortyp"
+        body: "Inhalt"
+        created_at: "Erstellt"
+        namespace: "Namensraum"
+        resource_type: "Ressourcentyp"
+        updated_at: "Aktualisiert"
   active_admin:
     dashboard: Übersicht
     dashboard_welcome:
@@ -37,6 +53,8 @@ de:
         lteq_datetime: "Kleiner gleich"
         from: "Von"
         to: "Bis"
+    scopes:
+      all: "Alle"
     search_status:
       headline: "Filter"
       current_scope: "Anwendungsbereich:"

data/config/locales/sk.yml

@@ -1,4 +1,24 @@
 sk:
+  activerecord:
+    models:
+      comment:
+        one: "Komentár"
+        few: "Komentáre"
+        many: "Komentárov"
+        other: "Komentáre"
+      active_admin/comment:
+        one: "Komentár"
+        few: "Komentáre"
+        many: "Komentárov"
+        other: "Komentáre"
+    attributes:
+      active_admin/comment:
+        author_type: "Typ autora"
+        body: "Telo"
+        created_at: "Vytvorený"
+        namespace: "Namespace"
+        resource_type: "Typ komentovanej položky"
+        updated_at: "Upravený"
   active_admin:
     dashboard: Úvod
     dashboard_welcome:
@@ -8,6 +28,7 @@ sk:
     edit: "Upraviť"
     delete: "Zmazať"
     delete_confirmation: "Ste si istí, že chcete túto položku zmazať?"
+    create_another: "Vytvoriť ďalší %{model}"
     new_model: "Vytvoriť"
     edit_model: "Upraviť"
     delete_model: "Zmazať"
@@ -20,6 +41,7 @@ sk:
     has_many_new: "Pridať nový"
     has_many_delete: "Zmazať"
     has_many_remove: "Odstrániť"
+    move: "Presunúť"
     filters:
       buttons:
         filter: "Filtrovať"
@@ -31,6 +53,17 @@ sk:
         ends_with: "Končí na"
         greater_than: "Väčší ako"
         less_than: "Menší ako"
+        gteq_datetime: "Od"
+        lteq_datetime: "Do"
+        from: "Od"
+        to: "Do"
+    scopes:
+      all: "Všetko"
+    search_status:
+      headline: "Stav vyhľadávania:"
+      current_scope: "Scope:"
+      current_filters: "Filtre:"
+      no_current_filters: "Žiadne"
     status_tag:
       "yes": "Áno"
       "no": "Nie"
@@ -40,6 +73,7 @@ sk:
     powered_by: "%{active_admin} %{version}"
     sidebars:
       filters: "Filtre"
+      search_status: "Stav vyhľadávania"
     pagination:
       empty: "Nenájdený."
       one: "Zobrazená  <b>1</b> položka"
@@ -70,11 +104,14 @@ sk:
       labels:
         destroy: "Vymazať"
     comments:
+      created_at: "Vytvorený"
       resource_type: "Typ zdroja"
       author_type: "Typ autora"
       body: "Telo"
       author: "Autor"
       add: "Pridať komentár"
+      delete: "Zmazať komentár"
+      delete_confirmation: "Naozaj chcete zmazať tento komentár?"
       resource: "Zdroj"
       no_comments_yet: "Žiadny komentár"
       author_missing: "Anonymný"
@@ -82,6 +119,19 @@ sk:
       errors:
         empty_text: "Komentár nebol uložený, je prázdny."
     devise:
+      username:
+        title: "Užívateľské meno"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Subdoména"
+      password:
+        title: "Heslo"
+      password_confirmation:
+        title: "Potvrdenie hesla"
+      sign_up:
+        title: "Registrácia"
+        submit: "Registrovať"
       login:
         title: "Prihlásenie"
         remember_me: "Zapamätať si ma"
@@ -95,11 +145,20 @@ sk:
       unlock:
         title: "Zaslanie inštrukcií k odomknutiu účtu"
         submit: "Zaslať inštrukcií k odomknutiu účtu"
+      resend_confirmation_instructions:
+        title: "Preposlanie potvrdzovacie inštrukcie"
+        submit: "Preposlať potvrdzovacie inštrukcie"
       links:
         sign_in: "Prihlásiť sa"
         sign_up: "Registrovať sa"
         forgot_your_password: "Zabudli ste heslo?"
         sign_in_with_omniauth_provider: "Prihlásiť sa cez %{provider}"
+        resend_unlock_instructions: "Poslať znovu inštrukcie na odomknutie účtu"
+        resend_confirmation_instructions: "Preposlať potvrdzovacie inštrukcie"
+    unsupported_browser:
+      headline: "ActiveAdmin nepodporuje Internet Explorer vo verzii <= 8."
+      recommendation: "Odporúčame <a href=\"http://browsehappy.com/\">aktualizovať Váš prehliadač</a>."
+      turn_off_compatibility_view: "Ak používate Internet Explorer vo verzii >= 9, uistite sa, že <a href=\"https://support.microsoft.com/en-us/help/17471\">\"režim kompatibility\" je vypnutý</a>"
     access_denied:
       message: "Nemáte oprávnenie k vykonaniu tejto akcie."
     index_list:

data/docs/Gemfile.lock

@@ -219,7 +219,7 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
+    rubyzip (2.0.0)
     safe_yaml (1.0.4)
     sass (3.6.0)
       sass-listen (~> 4.0.0)

data/lib/active_admin/filters/resource_extension.rb

@@ -129,12 +129,36 @@ module ActiveAdmin
           not_poly.reject! { |r| r.chain.length > 2 }
 
           filters = poly.map(&:foreign_type) + not_poly.map(&:name)
+
+          # Check high-arity associations for filterable columns
+          max = namespace.maximum_association_filter_arity
+          if max != :unlimited
+            high_arity, low_arity = not_poly.partition do |r|
+              r.klass.reorder(nil).limit(max + 1).count > max
+            end
+
+            # Remove high-arity associations with no searchable column
+            high_arity = high_arity.select(&method(:searchable_column_for))
+
+            high_arity = high_arity.map { |r| r.name.to_s + "_" + searchable_column_for(r) + namespace.filter_method_for_large_association }
+
+            filters = poly.map(&:foreign_type) + low_arity.map(&:name) + high_arity
+          end
+
           filters.map &:to_sym
         else
           []
         end
       end
 
+      def search_columns
+        @search_columns ||= namespace.filter_columns_for_large_association.map(&:to_s)
+      end
+
+      def searchable_column_for(relation)
+        relation.klass.column_names.find { |name| search_columns.include?(name) }
+      end
+
       def add_filters_sidebar_section
         self.sidebar_sections << filters_sidebar_section
       end

data/lib/active_admin/namespace_settings.rb

@@ -106,5 +106,18 @@ module ActiveAdmin
 
     # Include association filters by default
     register :include_default_association_filters, true
+
+    register :maximum_association_filter_arity, :unlimited
+
+    register :filter_columns_for_large_association, [
+        :display_name,
+        :full_name,
+        :name,
+        :username,
+        :login,
+        :title,
+        :email,
+    ]
+    register :filter_method_for_large_association, '_starts_with'
   end
 end

data/lib/active_admin/order_clause.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     attr_reader :field, :order, :active_admin_config
 
     def initialize(active_admin_config, clause)
-      clause =~ /^([\w\_\.]+)(->'\w+')?_(desc|asc)$/
+      clause =~ /^([\w\.]+)(->'\w+')?_(desc|asc)$/
       @column = $1
       @op = $2
       @order = $3

data/lib/active_admin/resource_controller/decorators.rb

@@ -67,8 +67,8 @@ module ActiveAdmin
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :total_pages, :to_key, :group_values, :except,
-                     :find_each, :ransack
+                     :total_count, :total_pages, :offset, :to_key, :group_values,
+                     :except, :find_each, :ransack
 
             define_singleton_method(:name) { name }
           end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/lib/active_admin/views/components/paginated_collection.rb

@@ -96,7 +96,7 @@ module ActiveAdmin
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # The #paginate method in kaminari will query the resource with a
           # count(*) to determine how many pages there should be unless
           # you pass in the :total_pages option. We issue a query to determine

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -286,12 +286,25 @@ ActiveAdmin.setup do |config|
   # config.filters = true
   #
   # By default the filters include associations in a select, which means
-  # that every record will be loaded for each association.
+  # that every record will be loaded for each association (up
+  # to the value of config.maximum_association_filter_arity).
   # You can enabled or disable the inclusion
   # of those filters by default here.
   #
   # config.include_default_association_filters = true
 
+  # config.maximum_association_filter_arity = 256 # default value of :unlimited will change to 256 in a future version
+  # config.filter_columns_for_large_association, [
+  #    :display_name,
+  #    :full_name,
+  #    :name,
+  #    :username,
+  #    :login,
+  #    :title,
+  #    :email,
+  #  ]
+  # config.filter_method_for_large_association, '_starts_with'
+
   # == Head
   #
   # You can add your own content to the site head like analytics. Make sure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -615,7 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style