From d4143c310111cdace548722a351ea05fab8ada95 Mon Sep 17 00:00:00 2001 From: Allan Date: Thu, 6 Oct 2022 19:25:47 +0200 Subject: [PATCH] Only output hidden user filters when not set to 'me' --- resources/views/search/all.blade.php | 4 ++-- tests/Entity/EntitySearchTest.php | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index 85e6d1b7b..96b14f6e5 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -61,10 +61,10 @@ @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'])) + @if(isset($options->filters['created_by']) && $options->filters['created_by'] !== "me") @endif - @if(isset($options->filters['updated_by'])) + @if(isset($options->filters['updated_by']) && $options->filters['updated_by'] !== "me") @endif diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php index cdb500a45..3cfd92820 100644 --- a/tests/Entity/EntitySearchTest.php +++ b/tests/Entity/EntitySearchTest.php @@ -448,8 +448,15 @@ class EntitySearchTest extends TestCase 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}')); - $this->withHtml($resp)->assertElementExists('form input[type="hidden"][name="filters[updated_by]"][value="me"]'); - $this->withHtml($resp)->assertElementExists('form input[type="hidden"][name="filters[created_by]"][value="dan"]'); + $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:dan} {created_by:dan}')); + $this->withHtml($resp)->assertElementExists('form input[name="filters[updated_by]"][value="dan"]'); + $this->withHtml($resp)->assertElementExists('form input[name="filters[created_by]"][value="dan"]'); + } + + public function test_searches_with_user_filters_using_me_adds_them_into_advanced_search_form() + { + $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:me} {created_by:me}')); + $this->withHtml($resp)->assertElementExists('form input[name="filters[updated_by]"][value="me"][checked="checked"]'); + $this->withHtml($resp)->assertElementExists('form input[name="filters[created_by]"][value="me"][checked="checked"]'); } }