Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 11:22:33 +01:00
Code Issues Releases Wiki Activity

Fixed tags listing grouping by name only on search

Browse Source 
Included test to cover case
This commit is contained in:
Dan Brown 2021-11-15 19:00:37 +00:00
parent 056d7c119f
commit 555723a966
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Actions/TagRepo.php
View File

@ -23,7 +23,6 @@ class TagRepo
*/
public function queryWithTotals(string $searchTerm, string $nameFilter): Builder
{
$groupingAttribute = $nameFilter ? 'value' : 'name';
$query = Tag::query()
->select([
'name',
@ -34,11 +33,15 @@ class TagRepo
DB::raw('SUM(IF(entity_type = \'BookStack\\\\Book\', 1, 0)) as book_count'),
DB::raw('SUM(IF(entity_type = \'BookStack\\\\BookShelf\', 1, 0)) as shelf_count'),
])
->groupBy($groupingAttribute)
->orderBy($groupingAttribute);
->orderBy($nameFilter ? 'value' : 'name');
if ($nameFilter) {
$query->where('name', '=', $nameFilter);
$query->groupBy('value');
} else if ($searchTerm) {
$query->groupBy('name', 'value');
} else {
$query->groupBy('name');
}
if ($searchTerm) {

12
tests/Entity/TagTest.php
View File

@ -145,6 +145,18 @@ class TagTest extends TestCase
$resp->assertElementNotExists('.tag-item .tag-name');
}
public function test_tag_index_search_will_show_mulitple_values_of_a_single_tag_name()
{
/** @var Page $page */
$page = Page::query()->first();
$page->tags()->create(['name' => 'Animal', 'value' => 'Catfish']);
$page->tags()->create(['name' => 'Animal', 'value' => 'Catdog']);
$resp = $this->asEditor()->get('/tags?search=cat');
$resp->assertElementContains('.tag-item .tag-value', 'Catfish');
$resp->assertElementContains('.tag-item .tag-value', 'Catdog');
}
public function test_tag_index_can_be_scoped_to_specific_tag_name()
{
/** @var Page $page */