activeadmin 2.14.0 → 3.2.0

data/config/locales/ru.yml

@@ -25,12 +25,6 @@ ru:
         filter: "Фильтровать"
         clear: "Очистить"
       predicates:
-        contains: "Содержит"
-        equals: "Равно"
-        starts_with: "Начинается с"
-        ends_with: "Заканчивается"
-        greater_than: "больше"
-        less_than: "меньше"
         from: "От"
         to: "До"
     search_status:

data/config/locales/sk.yml

@@ -47,14 +47,6 @@ sk:
         filter: "Filtrovať"
         clear: "Vyčistiť filtre"
       predicates:
-        contains: "Obsahuje"
-        equals: "Je presne"
-        starts_with: "Začína na"
-        ends_with: "Končí na"
-        greater_than: "Väčší ako"
-        less_than: "Menší ako"
-        gteq_datetime: "Od"
-        lteq_datetime: "Do"
         from: "Od"
         to: "Do"
     scopes:

data/config/locales/sv-SE.yml

@@ -1,17 +1,34 @@
 "sv-SE":
+  activerecord:
+    models:
+      comment:
+        one: "Kommentar"
+        other: "Kommentarer"
+      active_admin/comment:
+        one: "Kommentar"
+        other: "Kommentarer"
+    attributes:
+      active_admin/comment:
+        author_type: "Författartyp"
+        body: "Innehåll"
+        created_at: "Skapad"
+        namespace: "Namnrymd"
+        resource_type: "Resurstyp"
+        updated_at: "Aktualiserad"
   active_admin:
     dashboard: Skrivbord
     dashboard_welcome:
       welcome: "Välkommen till Active Admin. Detta är ditt standardskrivbord."
-      call_to_action: "För att lägga till sektioner, gör en checkout på 'app/admin/dashboard.rb'"
+      call_to_action: "För att lägga till sektioner, gå till 'app/admin/dashboard.rb'"
     view: "Visa"
     edit: "Redigera"
     delete: "Ta bort"
-    delete_confirmation: "Är du säker att du vill ta bort denna?"
+    delete_confirmation: "Är du säker på att du vill ta bort detta?"
+    create_another: "Skapa en till %{model}"
     new_model: "Ny %{model}"
     edit_model: "Redigera %{model}"
     delete_model: "Ta bort %{model}"
-    details: "Detaljvy för %{model}"
+    details: "%{model}-detaljer"
     cancel: "Avbryt"
     empty: "Tom"
     previous: "Föregående"
@@ -20,82 +37,84 @@
     has_many_new: "Skapa en ny %{model}"
     has_many_delete: "Ta bort"
     has_many_remove: "Ta bort"
+    move: "Flytta"
     filters:
       buttons:
-        filter: "Filter"
+        filter: "Filtrera"
         clear: "Rensa filter"
       predicates:
-        contains: "Innehåller"
-        equals: "Lika med"
-        starts_with: "Börjar med"
-        ends_with: "Slutar med"
-        greater_than: "Större än"
-        less_than: "Mindre än"
         from: "Från"
         to: "Till"
+    scopes:
+      all: "Alla"
     search_status:
-      headline: "Sök status:"
-      current_scope: "Scope:"
-      current_filters: "Nuvarande filter:"
+      headline: "Sökstatus:"
+      current_scope: "Omfattning:"
+      current_filters: "Aktiva filter:"
       no_current_filters: "Inga"
     status_tag:
       "yes": "Ja"
       "no": "Nej"
       "unset": "Nej"
-    main_content: "Implementera %{model}#main_content för att kunna visa något."
+    main_content: "Implementera %{model}#main_content för att visa innehåll."
     logout: "Logga ut"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filter"
-      search_status: "Sök status"
+      search_status: "Sökstatus"
     pagination:
-      empty: "Ingen %{model} funnen"
-      one: "Visar <b>1</b> utav %{model}"
-      one_page: "Visar <b>alla %{n}</b> utav %{model}"
+      empty: "Ingen %{model} hittades"
+      one: "Visar <b>1</b> %{model}"
+      one_page: "Visar <b>alla %{n}</b> %{model}"
       multiple: "Visar %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> av <b>%{total}</b> totalt"
       multiple_without_total: "Visar %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Per sida: "
       entry:
         one: "inlägg"
         other: "inlägg"
-    any: "Någon"
+    any: "Alla"
     blank_slate:
-      content: "Finns inga %{resource_name} än."
+      content: "Det finns inga %{resource_name} än."
       link: "Skapa en"
     dropdown_actions:
-      button_label: "Behandling"
+      button_label: "Åtgärder"
     batch_actions:
-      button_label: "Batch behandling"
+      button_label: "Batch-åtgärder"
       default_confirmation: "Är du säker på att du vill göra detta?"
       delete_confirmation: "Är du säker på att du vill radera dessa %{plural_model}?"
       succesfully_destroyed:
         one: "Lyckades radera 1 %{model}"
         other: "Lyckades radera %{count} %{plural_model}"
-      selection_toggle_explanation: "(Toggle Selection)"
-      action_label: "%{title} Markerad"
+      selection_toggle_explanation: "(Byt markering)"
+      action_label: "%{title} markerad"
       labels:
         destroy: "Radera"
     comments:
       created_at: "Skapad"
-      resource_type: "Resurs typ"
-      author_type: "Författar typ"
+      resource_type: "Resurstyp"
+      author_type: "Författartyp"
       body: "Innehåll"
       author: "Författare"
       add: "Lägg till kommentar"
+      delete: "Radera kommentar"
+      delete_confirmation: "Är du säker på att du vill radera dessa kommentarer?"
       resource: "Resurs"
       no_comments_yet: "Inga kommentarer än."
       author_missing: "Anonym"
       title_content: "Kommentarer (%{count})"
       errors:
-        empty_text: "Kommentaren sparades inte, måste innehålla text."
+        empty_text: "Kommentaren sparades inte. Textfältet får inte vara tomt."
     devise:
       username:
         title: "Användarnamn"
       email:
-        title: "Epost"
+        title: "E-post"
       subdomain:
         title: "Subdomän"
       password:
         title: "Lösenord"
+      password_confirmation:
+        title: "Bekräfta lösenord"
       sign_up:
         title: "Registera"
         submit: "Registera"
@@ -105,29 +124,29 @@
         submit: "Inloggning"
       reset_password:
         title: "Glömt ditt lösenord?"
-        submit: "Återställa mitt lösenord"
+        submit: "Återställ mitt lösenord"
       change_password:
         title: "Ändra ditt lösenord"
         submit: "Ändra mitt lösenord"
       unlock:
-        title: "Skicka upplåsnings instruktioner"
-        submit: "Skicka upplåsnings instruktioner"
+        title: "Skicka upplåsningsinstruktioner"
+        submit: "Skicka upplåsningsinstruktioner"
       resend_confirmation_instructions:
-        title: "Skicka bekräftnings instruktioner"
-        submit: "Skicka bekräftnings instruktioner"
+        title: "Skicka bekräftelseinstruktioner"
+        submit: "Skicka bekräftelseinstruktioner"
       links:
         sign_up: "Registera"
         sign_in: "Logga in"
         forgot_your_password: "Glömt ditt lösenord?"
         sign_in_with_omniauth_provider: "Logga in med %{provider}"
-        resend_unlock_instructions: "Skicka upplåsnings instruktioner"
-        resend_confirmation_instructions: "Skicka bekräftnings instruktioner"
+        resend_unlock_instructions: "Skicka upplåsningsinstruktioner igen"
+        resend_confirmation_instructions: "Skicka bekräftningsinstruktioner igen"
     unsupported_browser:
-      headline: "Notera att ActiveAdmin inte längre stödjer Internet Explorer version 8 eller mindre."
-      recommendation: "Vi rekommenderar dig att uppgradera till den senaste versionen av <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, eller <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
-      turn_off_compatibility_view: "Om du använder IE 9 eller senare, se till att <a href=\"https://support.microsoft.com/sv-se/help/17471\">stäng av \"Compatibility View\"</a>."
+      headline: "Observera att ActiveAdmin inte längre stödjer Internet Explorer version 8 eller lägre."
+      recommendation: "Vi rekommenderar att du uppgraderar till den senaste versionen av <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, eller <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
+      turn_off_compatibility_view: "Om du använder IE 9 eller senare, se till att <a href=\"https://support.microsoft.com/sv-se/help/17471\">stänga av \"Compatibility View\"</a>."
     access_denied:
-      message: "Du har inte rättighet att utföra denna åtgärd."
+      message: "Du har inte behörighet att utföra denna åtgärd."
     index_list:
       table: "Tabell"
       block: "Lista"

data/config/locales/tr.yml

@@ -26,17 +26,6 @@ tr:
       buttons:
         filter: "Filtrele"
         clear: "Filtreleri Temizle"
-      predicates:
-        contains: "İçerir"
-        equals: "Eşittir"
-        starts_with: "İle başlar"
-        ends_with: "İle biter"
-        greater_than: "Büyüktür"
-        less_than: "Küçüktür"
-        gteq_datetime: "Büyük yada eşit"
-        lteq_datetime: "Küçük yada eşit"
-        from: "Başlangıç"
-        to: "Bitiş"
     search_status:
       headline: "Arama"
       current_scope: "Kapsam:"

data/config/locales/uk.yml

@@ -25,12 +25,6 @@ uk:
         filter: "Фільтрувати"
         clear: "Очистити"
       predicates:
-        contains: "Містить"
-        equals: "="
-        starts_with: "Починається з"
-        ends_with: "Закінчується"
-        greater_than: "більше"
-        less_than: "менше"
         from: "від"
         to: "до"
     search_status:

data/config/locales/vi.yml

@@ -43,14 +43,6 @@ vi:
         filter: "Lọc"
         clear: "Xóa dữ liệu lọc"
       predicates:
-        contains: "Có chứa"
-        equals: "Bằng"
-        starts_with: "Bắt đầu với"
-        ends_with: "Kết thúc bởi"
-        greater_than: "Lớn hơn"
-        less_than: "Nhỏ hơn"
-        gteq_datetime: "Lớn hơn hoặc bằng"
-        lteq_datetime: "Nhỏ hơn hoặc bằng"
         from: "Từ"
         to: "Đến"
     scopes:

data/config/locales/zh-CN.yml

@@ -43,14 +43,6 @@
         filter: "过滤"
         clear: "清除条件"
       predicates:
-        contains: "包含"
-        equals: "等于"
-        starts_with: "始于"
-        ends_with: "止于"
-        greater_than: "大于"
-        less_than: "小于"
-        gteq_datetime: "大于等于"
-        lteq_datetime: "小于等于"
         from: "起"
         to: "止"
     scopes:

data/config/locales/zh-TW.yml

@@ -24,13 +24,6 @@
       buttons:
         filter: "篩選"
         clear: "清除篩選條件"
-      predicates:
-        contains: "包含"
-        equals: "等於"
-        starts_with: "開頭為"
-        ends_with: "結尾為"
-        greater_than: "大於"
-        less_than: "小於"
     search_status:
       headline: "搜尋條件:"
       current_scope: "子集："

data/lib/active_admin/csv_builder.rb

@@ -51,7 +51,7 @@ module ActiveAdmin
       csv << bom if bom
 
       if column_names
-        csv << CSV.generate_line(columns.map { |c| encode c.name, options }, **csv_options)
+        csv << CSV.generate_line(columns.map { |c| sanitize(encode(c.name, options)) }, **csv_options)
       end
 
       controller.send(:in_paginated_batches) do |resource|
@@ -70,7 +70,7 @@ module ActiveAdmin
 
     def build_row(resource, columns, options)
       columns.map do |column|
-        encode call_method_or_proc_on(resource, column.data), options
+        sanitize(encode(call_method_or_proc_on(resource, column.data), options))
       end
     end
 
@@ -86,6 +86,10 @@ module ActiveAdmin
       end
     end
 
+    def sanitize(content)
+      Sanitizer.sanitize(content)
+    end
+
     def method_missing(method, *args, &block)
       if @view_context.respond_to? method
         @view_context.public_send method, *args, &block
@@ -120,4 +124,21 @@ module ActiveAdmin
       @column_transitive_options ||= @options.slice(*COLUMN_TRANSITIVE_OPTIONS)
     end
   end
+
+  # Prevents CSV Injection according to https://owasp.org/www-community/attacks/CSV_Injection
+  module Sanitizer
+    extend self
+
+    ATTACK_CHARACTERS = ["=", "+", "-", "@", "\t", "\r"].freeze
+
+    def sanitize(value)
+      return "'#{value}" if require_sanitization?(value)
+
+      value
+    end
+
+    def require_sanitization?(value)
+      value.is_a?(String) && value.starts_with?(*ATTACK_CHARACTERS)
+    end
+  end
 end

data/lib/active_admin/engine.rb

@@ -21,5 +21,9 @@ module ActiveAdmin
     initializer "active_admin.routes" do
       require "active_admin/helpers/routes/url_helpers"
     end
+
+    initializer "active_admin.deprecator" do |app|
+      app.deprecators[:activeadmin] = ActiveAdmin.deprecator if app.respond_to?(:deprecators)
+    end
   end
 end

data/lib/active_admin/filters/active_filter.rb

@@ -41,7 +41,7 @@ module ActiveAdmin
 
       def predicate_name
         I18n.t(
-          "active_admin.filters.predicates.#{condition.predicate.name}",
+          "ransack.predicates.#{condition.predicate.name}",
           default: ransack_predicate_name)
       end
 

data/lib/active_admin/filters/forms.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
       # Returns the default filter type for a given attribute. If you want
       # to use a custom search method, you have to specify the type yourself.
       def default_input_type(method, options = {})
-        if method =~ /_(eq|equals|cont|contains|start|starts_with|end|ends_with)\z/
+        if method =~ /_(eq|cont|start|end)\z/
           :string
         elsif klass._ransackers.key?(method.to_s)
           klass._ransackers[method.to_s].type
@@ -31,7 +31,7 @@ module ActiveAdmin
           case column.type
           when :date, :datetime
             :date_range
-          when :string, :text
+          when :string, :text, :citext
             :string
           when :integer, :float, :decimal
             :numeric

data/lib/active_admin/filters/formtastic_addons.rb

@@ -47,7 +47,7 @@ module ActiveAdmin
       #
 
       def searchable_has_many_through?
-        if reflection && reflection.options[:through]
+        if klass.ransackable_associations.include?(method.to_s) && reflection && reflection.options[:through]
           reflection.through_reflection.klass.ransackable_attributes.include? reflection.foreign_key
         else
           false

data/lib/active_admin/inputs/filters/base/search_method_select.rb

@@ -9,7 +9,7 @@
 #     include Base
 #     include Base::SearchMethodSelect
 #
-#     filter :equals, :greater_than, :less_than
+#     filter :eq, :gt, :lt
 #   end
 #
 module ActiveAdmin
@@ -65,7 +65,7 @@ module ActiveAdmin
 
           def filter_options
             filters.collect do |filter|
-              [I18n.t("active_admin.filters.predicates.#{filter}"), "#{method}_#{filter}"]
+              [I18n.t("ransack.predicates.#{filter}").capitalize, "#{method}_#{filter}"]
             end
           end
 

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -15,12 +15,12 @@ module ActiveAdmin
         end
 
         def gt_input_name
-          column && column.type == :date ? "#{method}_gteq" : "#{method}_gteq_datetime"
+          "#{method}_gteq"
         end
         alias :input_name :gt_input_name
 
         def lt_input_name
-          column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
+          "#{method}_lteq"
         end
 
         def input_html_options

data/lib/active_admin/inputs/filters/numeric_input.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
         include Base
         include Base::SearchMethodSelect
 
-        filter :equals, :greater_than, :less_than
+        filter :eq, :gt, :lt
       end
     end
   end

data/lib/active_admin/inputs/filters/select_input.rb

@@ -43,6 +43,8 @@ module ActiveAdmin
           else
             super
           end
+        rescue ActiveRecord::QueryCanceled => error
+          raise ActiveRecord::QueryCanceled.new "#{error.message.strip} while querying the values for the ActiveAdmin :#{method} filter"
         end
 
         def pluck_column

data/lib/active_admin/inputs/filters/string_input.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
         include Base
         include Base::SearchMethodSelect
 
-        filter :contains, :equals, :starts_with, :ends_with
+        filter :cont, :eq, :start, :end
 
         # If the filter method includes a search condition, build a normal string search field.
         # Else, build a search field with a companion dropdown to choose a search condition from.

data/lib/active_admin/menu.rb

@@ -48,6 +48,7 @@ module ActiveAdmin
       #   menu.add parent: 'Dashboard', label: 'My Child Dashboard'
       #
       def add(options)
+        options = options.dup # Make sure parameter is not modified
         parent_chain = Array.wrap(options.delete(:parent))
 
         item = if parent = parent_chain.shift

data/lib/active_admin/namespace.rb

@@ -28,7 +28,7 @@ module ActiveAdmin
   class Namespace
     class << self
       def setting(name, default)
-        Deprecation.warn "This method does not do anything and will be removed."
+        ActiveAdmin.deprecator.warn "This method does not do anything and will be removed."
       end
     end
 

data/lib/active_admin/namespace_settings.rb

@@ -119,7 +119,7 @@ module ActiveAdmin
         :title,
         :email,
     ]
-    register :filter_method_for_large_association, "_starts_with"
+    register :filter_method_for_large_association, "_start"
 
     # Switch between asset pipeline and webpacker assets
     register :use_webpacker, false

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -28,5 +28,13 @@ module ActiveAdmin
       self.resource_type = self.class.resource_type(resource)
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      authorizable_ransackable_attributes
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      authorizable_ransackable_associations
+    end
+
   end
 end

data/lib/active_admin/pundit_adapter.rb

@@ -77,7 +77,7 @@ module ActiveAdmin
 
       policy_name = policy.class.to_s
 
-      Deprecation.warn "You have `pundit_policy_namespace` configured as `#{default_policy_namespace}`, " \
+      ActiveAdmin.deprecator.warn "You have `pundit_policy_namespace` configured as `#{default_policy_namespace}`, " \
         "but ActiveAdmin was unable to find policy #{default_policy_module}::#{policy_name}. " \
         "#{policy_name} will be used instead. " \
         "This behavior will be removed in future versions of ActiveAdmin. " \

data/lib/active_admin/resource_controller/streaming.rb

@@ -31,7 +31,7 @@ module ActiveAdmin
       end
 
       def csv_filename
-        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_formatted_s(:default)}.csv"
+        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_s}.csv"
       end
 
       def stream_csv

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "2.14.0"
+  VERSION = "3.2.0"
 end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -24,7 +24,14 @@ module ActiveAdmin
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        ERB::Util.html_escape(render_in_context(resource, display_name_method_for(resource))) unless resource.nil?
+        unless resource.nil?
+          result = render_in_context(resource, display_name_method_for(resource))
+          if result.to_s&.strip&.present?
+            ERB::Util.html_escape(result)
+          else
+            ERB::Util.html_escape(render_in_context(resource, DISPLAY_NAME_FALLBACK))
+          end
+        end
       end
 
       # Looks up and caches the first available display name method.

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

@@ -102,10 +102,6 @@ module ActiveAdmin
         form_builder.object
       end
 
-      def form_buffers
-        raise "'form_buffers' has been removed from ActiveAdmin::FormBuilder, please read https://github.com/activeadmin/activeadmin/blob/master/docs/5-forms.md for details."
-      end
-
       private
 
       def create_another_checkbox

data/lib/active_admin/views/index_as_table.rb

@@ -304,10 +304,6 @@ module ActiveAdmin
           end
         end
 
-        def default_actions
-          raise "`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead."
-        end
-
         # Add links to perform actions.
         #
         # ```ruby

data/lib/active_admin/views/pages/show.rb

@@ -40,13 +40,7 @@ module ActiveAdmin
         protected
 
         def default_title
-          title = display_name(resource)
-
-          if title.blank?
-            title = "#{active_admin_config.resource_label} ##{resource.id}"
-          end
-
-          title
+          display_name(resource)
         end
 
         module DefaultMainContent

data/lib/active_admin.rb

@@ -3,7 +3,6 @@ require "active_support/core_ext"
 require "set"
 
 require "ransack"
-require "ransack_ext"
 require "kaminari"
 require "formtastic"
 require "formtastic_i18n"
@@ -27,7 +26,6 @@ module ActiveAdmin
   autoload :ControllerAction, "active_admin/controller_action"
   autoload :CSVBuilder, "active_admin/csv_builder"
   autoload :Dependency, "active_admin/dependency"
-  autoload :Deprecation, "active_admin/deprecation"
   autoload :Devise, "active_admin/devise"
   autoload :DSL, "active_admin/dsl"
   autoload :FormBuilder, "active_admin/form_builder"
@@ -62,6 +60,10 @@ module ActiveAdmin
       @application ||= ::ActiveAdmin::Application.new
     end
 
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("4.0", "active-admin")
+    end
+
     # Gets called within the initializer
     def setup
       application.setup!

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

@@ -320,7 +320,7 @@ ActiveAdmin.setup do |config|
   #    :title,
   #    :email,
   #  ]
-  # config.filter_method_for_large_association = '_starts_with'
+  # config.filter_method_for_large_association = '_start'
 
   # == Head
   #