archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-03 07:49:57 +00:00
Code Issues Projects Releases Wiki Activity

Prevented created/update_by filters be wiped in search

Browse source 
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
This commit is contained in:
Dan Brown 2021-11-14 15:07:13 +00:00
parent 8e71cd9bac
commit 2e49b16177
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 14 additions and 0 deletions
resources/views/search
all.blade.php
tests/Entity
EntitySearchTest.php

7
resources/views/search/all.blade.php
View file

@ -61,6 +61,13 @@
@include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $options->filters]) @include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $options->filters])
@include('search.parts.date-filter', ['name' => 'created_before', '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> <button type="submit" class="button">{{ trans('entities.search_update') }}</button>
</form> </form>

7
tests/Entity/EntitySearchTest.php
View file

@ -411,4 +411,11 @@ class EntitySearchTest extends TestCase
$search->assertSee('My &lt;cool&gt; <strong>TestPageContent</strong>', false); $search->assertSee('My &lt;cool&gt; <strong>TestPageContent</strong>', false);
$search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', 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"]');
}
} }