From 2e49b1617743ee844b5eb63d0e8fd6bca6343d12 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Nov 2021 15:07:13 +0000
Subject: [PATCH] Prevented created/update_by filters be wiped in search

Updating filters via sidebar would wipe the created_by/update_by filters
since these were not part of the sidebar filter form.
This adds them, if existing, as hidden inputs.
Includes tests to cover.

Closes #2736
---
 resources/views/search/all.blade.php | 7 +++++++
 tests/Entity/EntitySearchTest.php    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index b9adccca7..85e6d1b7b 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -61,6 +61,13 @@
                         @include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $options->filters])
                         @include('search.parts.date-filter', ['name' => 'created_before', 'filters' => $options->filters])
 
+                        @if(isset($options->filters['created_by']))
+                            <input type="hidden" name="filters[created_by]" value="{{ $options->filters['created_by'] }}">
+                        @endif
+                        @if(isset($options->filters['updated_by']))
+                            <input type="hidden" name="filters[updated_by]" value="{{ $options->filters['updated_by'] }}">
+                        @endif
+
                         <button type="submit" class="button">{{ trans('entities.search_update') }}</button>
                     </form>
 
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 6929adc74..2b7bfd08d 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -411,4 +411,11 @@ class EntitySearchTest extends TestCase
         $search->assertSee('My &lt;cool&gt; <strong>TestPageContent</strong>', false);
         $search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', false);
     }
+
+    public function test_searches_with_user_filters_adds_them_into_advanced_search_form()
+    {
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:me} {created_by:dan}'));
+        $resp->assertElementExists('form input[type="hidden"][name="filters[updated_by]"][value="me"]');
+        $resp->assertElementExists('form input[type="hidden"][name="filters[created_by]"][value="dan"]');
+    }
 }