archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-01 06:59:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'search-owned-by-me' of git://github.com/benediktvolke/BookStack into benediktvolke-search-owned-by-me

Browse source
This commit is contained in:
Dan Brown 2021-03-15 18:21:09 +00:00
commit c8564b7792
4 changed files with 25 additions and 3 deletions
app/Entities/Tools
SearchRunner.php
resources
lang/en
entities.php
views/search
all.blade.php
tests/Entity
EntitySearchTest.php

11
app/Entities/Tools/SearchRunner.php
View file

@ -287,6 +287,17 @@ class SearchRunner
} }
} }
protected function filterOwnedBy(EloquentBuilder $query, Entity $model, $input)
{
if (!is_numeric($input) && $input !== 'me') {
return;
}
if ($input === 'me') {
$input = user()->id;
}
$query->where('owned_by', '=', $input);
}
protected function filterInName(EloquentBuilder $query, Entity $model, $input) protected function filterInName(EloquentBuilder $query, Entity $model, $input)
{ {
$query->where('name', 'like', '%' .$input. '%'); $query->where('name', 'like', '%' .$input. '%');

3
resources/lang/en/entities.php
View file

@ -60,6 +60,7 @@ return [
'search_permissions_set' => 'Permissions set', 'search_permissions_set' => 'Permissions set',
'search_created_by_me' => 'Created by me', 'search_created_by_me' => 'Created by me',
'search_updated_by_me' => 'Updated by me', 'search_updated_by_me' => 'Updated by me',
'search_owned_by_me' => 'Owned by me',
'search_date_options' => 'Date Options', 'search_date_options' => 'Date Options',
'search_updated_before' => 'Updated before', 'search_updated_before' => 'Updated before',
'search_updated_after' => 'Updated after', 'search_updated_after' => 'Updated after',
@ -316,4 +317,4 @@ return [
'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.', 'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
'revision_delete_success' => 'Revision deleted', 'revision_delete_success' => 'Revision deleted',
'revision_cannot_delete_latest' => 'Cannot delete the latest revision.' 'revision_cannot_delete_latest' => 'Cannot delete the latest revision.'
]; ];

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

@ -50,6 +50,9 @@
@component('search.form.boolean-filter', ['filters' => $options->filters, 'name' => 'updated_by', 'value' => 'me']) @component('search.form.boolean-filter', ['filters' => $options->filters, 'name' => 'updated_by', 'value' => 'me'])
{{ trans('entities.search_updated_by_me') }} {{ trans('entities.search_updated_by_me') }}
@endcomponent @endcomponent
@component('search.form.boolean-filter', ['filters' => $options->filters, 'name' => 'owned_by', 'value' => 'me'])
{{ trans('entities.search_owned_by_me') }}
@endcomponent
@endif @endif
<h6>{{ trans('entities.search_date_options') }}</h6> <h6>{{ trans('entities.search_date_options') }}</h6>

11
tests/Entity/EntitySearchTest.php
View file

@ -134,16 +134,23 @@ class EntitySearchTest extends TestCase
// User filters // User filters
$this->get('/search?term=' . urlencode('danzorbhsing {created_by:me}'))->assertDontSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {created_by:me}'))->assertDontSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertDontSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertDontSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by: '.$editorSlug.'}'))->assertDontSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {owned_by:me}'))->assertDontSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by:'.$editorId.'}'))->assertDontSee($page->name);
$page->created_by = $editorId; $page->created_by = $editorId;
$page->save(); $page->save();
$this->get('/search?term=' . urlencode('danzorbhsing {created_by:me}'))->assertSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {created_by:me}'))->assertSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {created_by: '.$editorSlug.'}'))->assertSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {created_by: '.$editorSlug.'}'))->assertSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertDontSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertDontSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {owned_by:me}'))->assertDontSee($page->name);
$page->updated_by = $editorId; $page->updated_by = $editorId;
$page->save(); $page->save();
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {updated_by:me}'))->assertSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {updated_by: '.$editorSlug.'}'))->assertSee($page->name); $this->get('/search?term=' . urlencode('danzorbhsing {updated_by:'.$editorSlug.'}'))->assertSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {owned_by:me}'))->assertDontSee($page->name);
$page->owned_by = $editorId;
$page->save();
$this->get('/search?term=' . urlencode('danzorbhsing {owned_by:me}'))->assertSee($page->name);
$this->get('/search?term=' . urlencode('danzorbhsing {owned_by:'.$editorSlug.'}'))->assertSee($page->name);
// Content filters // Content filters
$this->get('/search?term=' . urlencode('{in_name:danzorbhsing}'))->assertDontSee($page->name); $this->get('/search?term=' . urlencode('{in_name:danzorbhsing}'))->assertDontSee($page->name);