Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Admin: nicer automatic filter/search bar placeholders/labels

Damian Legawiec3961b3f90e42
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
index 22a47b9f06..aeb3642210 100644
--- a/admin/app/views/spree/admin/orders/_filters.html.erb
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -1,6 +1,6 @@
<%= search_form_for [:admin, @vendor || @user, @search], url: controller_name == 'checkouts' ? spree.admin_checkouts_url : nil, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
<div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multisearch, label: Spree.t(:number), badge_name: Spree.t(:query) %>
+ <%= render 'spree/admin/shared/filters_search_bar', param: :multisearch %>
<div class="d-flex align-items-center justify-content-between">
<div class="mr-2 h-100">
diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erb
index 6772bc882b..a00baf3793 100644
--- a/admin/app/views/spree/admin/products/_filters.html.erb
+++ b/admin/app/views/spree/admin/products/_filters.html.erb
@@ -1,6 +1,6 @@
<%= search_form_for product_list_filters_search_form_path, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
<div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, label: "Name, SKU, brand, etc", badge_name: Spree.t(:query) %>
+ <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
<div class="d-flex align-items-center justify-content-between">
<%= render "spree/admin/products/table_filter_dropdown" %>
diff --git a/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb b/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb
index ae42a1e5c7..2b620cb56e 100644
--- a/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb
+++ b/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb
@@ -1,10 +1,13 @@
+<% label ||= Spree.t(:query) %>
<% badge_name ||= label %>
+<% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
+
<div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue flex-grow-1 mb-3 mb-lg-0 w-auto">
<%= icon "search", class: "mr-3 text-muted" %>
<%= search_field_tag "q[#{param}]",
params.dig(:q, param),
class: "form-control-plaintext px-0",
- placeholder: "#{Spree.t(:search_by)} #{label}",
+ placeholder: placeholder,
data: {
filters_target: :input,
badge_name: badge_name,