Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevented "Recently Viewed" homepage list showing non-user-viewed items

Browse Source 
Triggered when the user has no/limited views. Added a test to cover.
Closes #2703
This commit is contained in:
Dan Brown 2021-04-27 21:05:01 +01:00
parent c4e31a0d5e
commit 83b576eb19
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Actions/ViewService.php
View File

@ -96,6 +96,7 @@ class ViewService
/** @var Entity $instance */
foreach ($this->entityProvider->all() as $name => $instance) {
$items = $instance::visible()->withLastView()
->having('last_viewed_at', '>', 0)
->orderBy('last_viewed_at', 'desc')
->skip($count * ($page - 1))
->take($count)

13
tests/HomepageTest.php
View File

@ -1,6 +1,9 @@
<?php namespace Tests;
use BookStack\Auth\Role;
use BookStack\Auth\User;
use BookStack\Entities\Models\Bookshelf;
use BookStack\Entities\Models\Page;
class HomepageTest extends TestCase
{
@ -141,4 +144,14 @@ class HomepageTest extends TestCase
$homeVisit->assertElementContains('.content-wrap', $shelf->name);
$homeVisit->assertElementContains('.content-wrap', $book->name);
}
public function test_new_users_dont_have_any_recently_viewed()
{
$user = factory(User::class)->create();
$viewRole = Role::getRole('Viewer');
$user->attachRole($viewRole);
$homeVisit = $this->actingAs($user)->get('/');
$homeVisit->assertElementContains('#recently-viewed', 'You have not viewed any pages');
}
}