diff --git a/app/admin/about_page_entries.rb b/app/admin/about_page_entries.rb index 675b9a144..2b9d22d82 100644 --- a/app/admin/about_page_entries.rb +++ b/app/admin/about_page_entries.rb @@ -10,10 +10,6 @@ permit_params :position, :code, translations_attributes: [:id, :locale, :title, :body, :_destroy] filter :position, as: :select - filter :translations_title_contains, as: :select, label: -> { I18n.t("activerecord.attributes.about_page_entry.title") }, - collection: -> { AboutPageEntry.with_translations(I18n.locale).pluck(:title) } - filter :translations_body_contains, as: :select, label: -> { I18n.t("activerecord.attributes.about_page_entry.body") }, - collection: -> { AboutPageEntry.with_translations(I18n.locale).pluck(:body) } controller do def scoped_collection diff --git a/app/admin/country.rb b/app/admin/country.rb index 86aa95ec4..929d88322 100644 --- a/app/admin/country.rb +++ b/app/admin/country.rb @@ -19,7 +19,7 @@ def scoped_collection scope -> { I18n.t("active_admin.shared.active") }, :active filter :iso, as: :select - filter :translations_name_contains, as: :select, + filter :translations_name_cont, as: :select, label: -> { I18n.t("activerecord.attributes.country.name") }, collection: -> { Country.order(:name).pluck(:name) } filter :region_iso, as: :select diff --git a/app/admin/donor.rb b/app/admin/donor.rb index a39741d87..00e959ecc 100644 --- a/app/admin/donor.rb +++ b/app/admin/donor.rb @@ -13,8 +13,6 @@ def scoped_collection permit_params :website, :logo, :priority, :category, translations_attributes: [:id, :locale, :name, :description] - filter :translations_name_contains, as: :select, label: -> { I18n.t("activerecord.attributes.donor.name") }, - collection: -> { Donor.with_translations(I18n.locale).pluck(:name) } filter :website, as: :select csv do diff --git a/app/admin/faq.rb b/app/admin/faq.rb index 0aebda73b..7c5398773 100644 --- a/app/admin/faq.rb +++ b/app/admin/faq.rb @@ -10,10 +10,6 @@ permit_params :position, translations_attributes: [:id, :locale, :question, :answer, :_destroy] filter :position, as: :select - filter :translations_question_contains, as: :select, label: proc { I18n.t("activerecord.attributes.faq.question") }, - collection: -> { Faq.with_translations(I18n.locale).pluck(:question) } - filter :translations_answer_contains, as: :select, label: proc { I18n.t("activerecord.attributes.faq.answer") }, - collection: -> { Faq.with_translations(I18n.locale).pluck(:answer) } controller do def scoped_collection diff --git a/app/admin/fmu.rb b/app/admin/fmu.rb index 7c7d02e2f..cde0d2c3f 100644 --- a/app/admin/fmu.rb +++ b/app/admin/fmu.rb @@ -28,7 +28,7 @@ def scoped_collection filter :id, as: :select filter :country, as: :select, label: proc { I18n.t("activerecord.models.country.one") }, collection: -> { Country.joins(:fmus).by_name_asc } filter :operator_in_all, as: :select, label: proc { I18n.t("activerecord.attributes.fmu.operator") }, collection: -> { Operator.order(:name) } - filter :translations_name_contains, + filter :translations_name_cont, as: :select, label: proc { I18n.t("activerecord.attributes.fmu/translation.name") }, collection: -> { Fmu.by_name_asc.pluck(:name) } @@ -38,7 +38,7 @@ def scoped_collection operator_in_all: Operator.pluck(:country_id, :id) }, operator_in_all: { - translations_name_contains: Operator.joins(fmus: :translations).where(fmu_translations: {locale: I18n.locale}).pluck(:id, "fmu_translations.name") + translations_name_cont: Operator.joins(fmus: :translations).where(fmu_translations: {locale: I18n.locale}).pluck(:id, "fmu_translations.name") } } end diff --git a/app/admin/government.rb b/app/admin/government.rb index d054e353a..d499f3f40 100644 --- a/app/admin/government.rb +++ b/app/admin/government.rb @@ -40,14 +40,14 @@ def scoped_collection end filter :country, as: :select, collection: -> { Country.joins(:governments).by_name_asc } - filter :translations_government_entity_contains, + filter :translations_government_entity_cont, as: :select, label: -> { I18n.t("activerecord.attributes.government/translation.government_entity") }, collection: -> { Government.by_entity_asc.distinct.pluck(:government_entity) } dependent_filters do { country_id: { - translations_government_entity_contains: Government.distinct.pluck(:country_id, :government_entity) + translations_government_entity_cont: Government.distinct.pluck(:country_id, :government_entity) } } end diff --git a/app/admin/operator_document_annex.rb b/app/admin/operator_document_annex.rb index afa54377e..71263b923 100644 --- a/app/admin/operator_document_annex.rb +++ b/app/admin/operator_document_annex.rb @@ -113,16 +113,16 @@ def scoped_collection actions end - filter :annex_documents_documentable_of_OperatorDocument_type_required_operator_document_name_equals, + filter :annex_documents_documentable_of_OperatorDocument_type_required_operator_document_name_eq, as: :select, label: proc { I18n.t("active_admin.operator_document_annexes_page.operator_document") }, collection: -> { RequiredOperatorDocument.order(:name).pluck(:name) } - filter :annex_documents_documentable_of_OperatorDocument_type_operator_name_equals, + filter :annex_documents_documentable_of_OperatorDocument_type_operator_name_eq, as: :select, label: proc { I18n.t("activerecord.models.operator") }, collection: -> { Operator.order(:name).pluck(:name) } - filter :annex_documents_documentable_of_OperatorDocument_type_fmu_translations_name_equals, + filter :annex_documents_documentable_of_OperatorDocument_type_fmu_translations_name_eq, as: :select, label: -> { I18n.t("activerecord.models.fmu.one") }, collection: -> { Fmu.by_name_asc.pluck(:name) } @@ -133,8 +133,8 @@ def scoped_collection dependent_filters do { - annex_documents_documentable_of_OperatorDocument_type_operator_name_equals: { - annex_documents_documentable_of_OperatorDocument_type_fmu_translations_name_equals: + annex_documents_documentable_of_OperatorDocument_type_operator_name_eq: { + annex_documents_documentable_of_OperatorDocument_type_fmu_translations_name_eq: Operator.joins(fmus: :translations).where(fmu_translations: {locale: I18n.locale}).pluck(:name, "fmu_translations.name") } } diff --git a/app/admin/partner.rb b/app/admin/partner.rb index 585cf2c66..2d2232b50 100644 --- a/app/admin/partner.rb +++ b/app/admin/partner.rb @@ -13,7 +13,7 @@ def scoped_collection permit_params :website, :logo, :priority, :category, translations_attributes: [:id, :locale, :name, :description] - filter :translations_name_contains, as: :select, label: proc { I18n.t("activerecord.attributes.partner.name") }, + filter :translations_name_cont, as: :select, label: proc { I18n.t("activerecord.attributes.partner.name") }, collection: -> { Partner.with_translations(I18n.locale).pluck(:name) } filter :website, as: :select diff --git a/app/admin/required_gov_document_group.rb b/app/admin/required_gov_document_group.rb index 7d2409254..b60569b5f 100644 --- a/app/admin/required_gov_document_group.rb +++ b/app/admin/required_gov_document_group.rb @@ -33,7 +33,7 @@ actions end - filter :translations_name_contains, + filter :translations_name_cont, as: :select, label: -> { I18n.t("activerecord.attributes.required_gov_document_group/translation.name") }, collection: -> { diff --git a/app/admin/required_operator_document_group.rb b/app/admin/required_operator_document_group.rb index ef6e0a0c2..4b149f57f 100644 --- a/app/admin/required_operator_document_group.rb +++ b/app/admin/required_operator_document_group.rb @@ -28,7 +28,7 @@ actions end - filter :translations_name_contains, + filter :translations_name_cont, label: proc { I18n.t("activerecord.attributes.required_operator_document_group.name") }, as: :select, collection: -> { diff --git a/app/admin/severity.rb b/app/admin/severity.rb index 859ffd6d6..5cd203453 100644 --- a/app/admin/severity.rb +++ b/app/admin/severity.rb @@ -17,7 +17,7 @@ def scoped_collection permit_params :subcategory_id, :level, translations_attributes: [:id, :locale, :details, :_destroy] - filter :translations_details_contains, label: -> { I18n.t("activerecord.attributes.severity.details") } + filter :translations_details_cont, label: -> { I18n.t("activerecord.attributes.severity.details") } filter :subcategory, as: :select, collection: -> { Subcategory.with_translations(I18n.locale).order("subcategory_translations.name") } filter :level, as: :select, collection: 0..3