Merge pull request #2008 from bolt/feature/filter-by-field

Filter by any field
bolt · Oct 17, 2020 · 99be02f · 99be02f
2 parents fe275c3 + 1c6af5a
commit 99be02f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/src/Controller/Backend/ListingController.php b/src/Controller/Backend/ListingController.php
@@ -56,6 +56,7 @@ public function overview(Query $query, string $contentType = ''): Response
             'records' => $records,
             'sortBy' => $this->getFromRequest('sortBy'),
             'filterValue' => $this->getFromRequest('filter'),
+            'filterKey' => $this->getFromRequest('filterKey'),
         ]);
     }
 }
diff --git a/src/Controller/TwigAwareController.php b/src/Controller/TwigAwareController.php
@@ -202,7 +202,8 @@ public function createPager(Query $query, string $contentType, int $pageSize, st
         }
 
         if ($this->request->get('filter')) {
-            $params['anyField'] = '%' . $this->getFromRequest('filter') . '%';
+            $key = $this->request->get('filterKey', 'anyField');
+            $params[$key] = '%' . $this->getFromRequest('filter') . '%';
         }
 
         if ($this->request->get('taxonomy')) {

diff --git a/templates/content/listing.html.twig b/templates/content/listing.html.twig
@@ -104,6 +104,16 @@
                         <input class="form-control" type="text" name="filter" id="content-filter" value="{{ filterValue }}"
                                placeholder="{{ 'listing.placeholder_filter'|trans }}"/>
                     </p>
+
+                    <p>
+                        <label for="filterKey">{{ 'listing.title_filterby_field'|trans }}</label>:
+                        <select name="filterKey" class="form-control">
+                            <option value="anyField"></option>
+                            {% for name, field in contentType.fields %}
+                                <option value="{{ name }}" {% if name == filterKey|default %}selected {% endif %}>{{ field.label }}</option>
+                            {% endfor %}
+                        </select>
+                    </p>
                 </div>
 
                     {{ macro.button('listing.button_filter', 'filter', 'tertiary mb-0', {'type': 'submit'}) }}

diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
@@ -2373,5 +2373,11 @@
         <target>Select …</target>
       </segment>
     </unit>
+    <unit id="fAmcKUQ" name="listing.title_filterby_field">
+      <segment>
+        <source>listing.title_filterby_field</source>
+        <target>Filter by field</target>
+      </segment>
+    </unit>
   </file>
 </xliff>