Feature dropdown for string filter to use contains, starts_with and ends_with activeadmin#2002

JoseLuis Torres · JoseLuis Torres · commit b3c8a1713fa0 · 2013-05-25T14:04:50.000-05:00
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -25,6 +25,9 @@ bg:
     filter: "Филтриране"
     clear_filters: "Изчистване"
     search_field: "Търсене по %{field}"
+    contains: "съдържа"
+    starts_with: "Започва с"
+    ends_with: "Завършва с"
     equal_to: "равно на"
     greater_than: "по-голямо от"
     less_than: "по-малко от"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -24,6 +24,9 @@ ca:
     filter: "Filtrar"
     clear_filters: "Treure filtres"
     search_field: "Cercar %{field}"
+    contains: "Conté"
+    starts_with: "Comença amb"
+    ends_with: "Acaba amb"
     equal_to: "Igual a"
     greater_than: "Més gran que"
     less_than: "Més petit que"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -25,6 +25,9 @@ cs:
     filter: "Filtrovat"
     clear_filters: "Vyčistit filtry"
     search_field: "Prohledat %{field}"
+    contains: "Obsahuje"
+    starts_with: "Začíná se"
+    ends_with: "Končí"
     equal_to: "Přesně"
     greater_than: "Větší než"
     less_than: "Menší než"
diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -25,6 +25,9 @@ da:
     filter: "Filtrer"
     clear_filters: "Ryd filtre"
     search_field: "Søg %{field}"
+    contains: "Indeholder"
+    starts_with: "Begynder med"
+    ends_with: "Slutter med"
     equal_to: "lig"
     greater_than: "større end"
     less_than: "mindre end"
diff --git a/config/locales/de-CH.yml b/config/locales/de-CH.yml
@@ -25,6 +25,9 @@
     filter: "Filtern"
     clear_filters: "Filter entfernen"
     search_field: "Durchsuche %{field}"
+    contains: "Enthält"
+    starts_with: "Beginnt mit"
+    ends_with: "Endet mit"
     equal_to: "Gleich"
     greater_than: "Grösser als"
     less_than: "Kleiner als"
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -25,6 +25,9 @@ de:
     filter: "Filtern"
     clear_filters: "Filter entfernen"
     search_field: "Durchsuche %{field}"
+    contains: "Enthält"
+    starts_with: "Beginnt mit"
+    ends_with: "Endet mit"
     equal_to: "Gleich"
     greater_than: "Größer als"
     less_than: "Kleiner als"
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
@@ -25,6 +25,9 @@
     filter: "Filter"
     clear_filters: "Clear Filters"
     search_field: "Search %{field}"
+    contains: "Contains"
+    starts_with: "Starts with"
+    ends_with: "Ends with"
     equal_to: "Equal To"
     greater_than: "Greater Than"
     less_than: "Less Than"
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -25,6 +25,9 @@ en:
     filter: "Filter"
     clear_filters: "Clear Filters"
     search_field: "Search %{field}"
+    contains: "Contains"
+    starts_with: "Starts with"
+    ends_with: "Ends with"
     equal_to: "Equal To"
     greater_than: "Greater Than"
     less_than: "Less Than"
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -25,6 +25,9 @@ es:
     filter: "Filtrar"
     clear_filters: "Quitar Filtros"
     search_field: "Buscar %{field}"
+    contains: "Contiene"
+    starts_with: "Empieza con"
+    ends_with: "Termina con"
     equal_to: "Igual a"
     greater_than: "Mayor que"
     less_than: "Menor que"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -25,6 +25,9 @@ fr:
     filter: "Filtrer"
     clear_filters: "Supprimer les filtres"
     search_field: "Rechercher %{field}"
+    contains: "Contient"
+    starts_with: "Commence par"
+    ends_with: "Se termine par"
     equal_to: "Egal à"
     greater_than: "Plus grand que"
     less_than: "Plus petit que"
diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -25,6 +25,9 @@ he:
     filter: "סינון"
     clear_filters: "איפוס שדות"
     search_field: "חיפוש %{field}"
+    contains: "מכיל"
+    starts_with: "מתחיל עם"
+    ends_with: "מסתיים ב"
     equal_to: "שווה ל"
     greater_than: "גדול מ"
     less_than: "פחות מ"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
@@ -25,6 +25,9 @@ hr:
     filter: "Filtriraj"
     clear_filters: "Očisti filtere"
     search_field: "Pretraži po %{field}"
+    contains: "Sadrži"
+    starts_with: "počinje s"
+    ends_with: "Završava sa"
     equal_to: "Jednako"
     greater_than: "Veće Od"
     less_than: "Manje Od"
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -25,6 +25,9 @@ it:
     filter: "Filtra"
     clear_filters: "Rimuovi filtri"
     search_field: "Cerca %{field}"
+    contains: "Contiene"
+    starts_with: "Inizia con"
+    ends_with: "Finisce con"
     equal_to: "Uguale a"
     greater_than: "Maggiore di"
     less_than: "Minore di"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -25,6 +25,9 @@ ja:
     filter: "絞り込む"
     clear_filters: "条件を削除する"
     search_field: "%{field} で絞り込む"
+    contains: "含まれています"
+    starts_with: "で始まる"
+    ends_with: "で終わる"
     equal_to: "等しい"
     greater_than: "より大きい"
     less_than: "より小さい"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
@@ -23,6 +23,9 @@ ko:
     filter: "필터"
     clear_filters: "필터 초기화"
     search_field: "%{field} 검색"
+    contains: "포함"
+    starts_with: "로 시작"
+    ends_with: "로 종료"
     equal_to: "같다"
     greater_than: "크다"
     less_than: "작다"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
@@ -25,6 +25,9 @@ lt:
     filter: 'Filtras'
     clear_filters: 'Išvalyti filtrus'
     search_field: 'Paieškos %{field}'
+    contains: "Sudėtyje yra"
+    starts_with: "Prasideda nuo"
+    ends_with: "Baigiasi"
     equal_to: 'lygus'
     greater_than: 'didesnis nei'
     less_than: 'mažiau nei'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
@@ -25,6 +25,9 @@ lv:
     filter: "Filtrēt"
     clear_filters: "Novākt filtrus"
     search_field: "Meklēt '%{field}' laukā"
+    contains: "Satur"
+    starts_with: "Sākas ar"
+    ends_with: "Beidzas ar"
     equal_to: "Vienāds ar"
     greater_than: "Lielāks par"
     less_than: "Mazāks par"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -25,6 +25,9 @@ nl:
     filter: "Filter"
     clear_filters: "Maak Filters Ongedaan"
     search_field: "Zoek %{field}"
+    contains: "Bevat"
+    starts_with: "Begint met"
+    ends_with: "Eindigt op"
     equal_to: "Gelijk aan"
     greater_than: "Groter dan"
     less_than: "Kleiner dan"
diff --git a/config/locales/no-NB.yml b/config/locales/no-NB.yml
@@ -23,6 +23,9 @@
     filter: "Filter"
     clear_filters: "Fjern filter"
     search_field: "Søk %{field}"
+    contains: "Inneholder"
+    starts_with: "Starter med"
+    ends_with: "Slutter med"
     equal_to: "Er lik"
     greater_than: "Større enn"
     less_than: "Mindre enn"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -25,6 +25,9 @@ pl:
     filter: "Filtruj"
     clear_filters: "Wyczyść Filtry"
     search_field: "Szukaj %{field}"
+    contains: "Zawiera"
+    starts_with: "Zaczyna się"
+    ends_with: "Kończy się"
     equal_to: "Równe"
     greater_than: "Większe niż"
     less_than: "Mniejsze niż"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -25,6 +25,9 @@
     filter: "Filtrar"
     clear_filters: "Limpar Filtros"
     search_field: "Pesquisar %{field}"
+    contains: "Contém"
+    starts_with: "Começa com"
+    ends_with: "Termina com"
     equal_to: "Igual A"
     greater_than: "Maior Que"
     less_than: "Menor Que"
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
@@ -25,6 +25,9 @@
     filter: "Filtrar"
     clear_filters: "Limpar Filtros"
     search_field: "Pesquisar %{field}"
+    contains: "Contém"
+    starts_with: "Começa com"
+    ends_with: "Termina com"
     equal_to: "Igual A"
     greater_than: "Maior Que"
     less_than: "Menor Que"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
@@ -25,6 +25,9 @@ ro:
     filter: "Cautati"
     clear_filters: "Stergeti filtrele"
     search_field: "Cautati dupa %{field}"
+    contains: "Conține"
+    starts_with: "începe cu"
+    ends_with: "se termină cu"
     equal_to: "Egal Cu"
     greater_than: "Mai Mare Decat"
     less_than: "Mai Mic Decat"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -25,6 +25,9 @@ ru:
     filter: "Фильтровать"
     clear_filters: "Очистить"
     search_field: "Искать по %{field}"
+    contains: "Содержит"
+    starts_with: "Начинается с"
+    ends_with: "Заканчивается"
     equal_to: "="
     greater_than: "больше"
     less_than: "меньше"
diff --git a/config/locales/sv-SE.yml b/config/locales/sv-SE.yml
@@ -25,6 +25,9 @@
     filter: "Filter"
     clear_filters: "Töm dina filters"
     search_field: "Sök %{field}"
+    contains: "Innehåller"
+    starts_with: "Börjar med"
+    ends_with: "Slutar med"
     equal_to: "Lika med"
     greater_than: "Större än"
     less_than: "Mindre än"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
@@ -25,6 +25,9 @@ tr:
     filter: "Filtrele"
     clear_filters: "Filtreleri Temizle"
     search_field: "%{field} alanında ara"
+    contains: "içerir"
+    starts_with: "ile başlar"
+    ends_with: "ile biter"
     equal_to: "Eşittir"
     greater_than: "Büyükse"
     less_than: "Küçükse"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
@@ -25,6 +25,9 @@ vi:
     filter: "Lọc"
     clear_filters: "Xóa dữ liệu lọc"
     search_field: "Tìm kiếm %{field}"
+    contains: "Thông tin"
+    starts_with: "Bắt đầu với"
+    ends_with: "Kết thúc với việc"
     equal_to: "Bằng"
     greater_than: "Lớn hơn"
     less_than: "Nhỏ hơn"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
@@ -25,6 +25,9 @@
     filter: "过滤"
     clear_filters: "清除条件"
     search_field: "查找%{field}"
+    contains: "包含"
+    starts_with: "开头"
+    ends_with: "完与"
     equal_to: "等于"
     greater_than: "大于"
     less_than: "小于"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
@@ -25,6 +25,9 @@
     filter: "篩選"
     clear_filters: "清除篩選條件"
     search_field: "搜尋 %{field}"
+    contains: "包含"
+    starts_with: "开头"
+    ends_with: "完与"
     equal_to: "等於"
     greater_than: "大於"
     less_than: "小於"
diff --git a/lib/active_admin/filters/forms.rb b/lib/active_admin/filters/forms.rb
@@ -16,6 +16,7 @@ def filter(method, options = {})
 
       # Returns the default filter type for a given attribute
       def default_input_type(method, options = {})
+        return :string if method =~ /_(contains|starts_with|ends_with)\z/
         if (column = column_for(method))
           case column.type
           when :date, :datetime
diff --git a/lib/active_admin/inputs/filter_string_input.rb b/lib/active_admin/inputs/filter_string_input.rb
@@ -2,25 +2,37 @@ module ActiveAdmin
   module Inputs
     class FilterStringInput < ::Formtastic::Inputs::StringInput
       include FilterBase
+      include FilterBase::SearchMethodSelect
 
       def to_html
-        input_wrapping do
-          label_html <<
-          builder.text_field(input_name, input_html_options)
+        if search_conditions =~ method.to_s
+          input_wrapping do
+            label_html <<
+            builder.text_field(input_name_simple, input_html_options)
+          end
+        else
+          super
         end
       end
 
+      def input_name_simple
+        method.to_s.match(search_conditions) ? method : "#{method}_contains"
+      end
+
+      def search_conditions
+        /_(contains|starts_with|ends_with)\z/
+      end
+
       def label_text
         I18n.t('active_admin.search_field', :field => super)
       end
 
-      def input_name
-        method.to_s.match(metasearch_conditions) ? method : "#{method}_contains"
+      def default_filters
+        [ [I18n.t('active_admin.contains'),    'contains'],
+          [I18n.t('active_admin.starts_with'), 'starts_with'],
+          [I18n.t('active_admin.ends_with'),   'ends_with'] ]
       end
 
-      def metasearch_conditions
-        /starts_with|ends_with/
-      end
     end
   end
 end
diff --git a/spec/unit/filters/filter_form_builder_spec.rb b/spec/unit/filters/filter_form_builder_spec.rb
