Merge branch 'show_more_informations_on_recently_updated_pages'

This commit is contained in:
Dan Brown 2022-01-24 18:23:47 +00:00
commit af39ff15ac
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
3 changed files with 29 additions and 3 deletions

View file

@ -364,7 +364,8 @@ class PageController extends Controller
*/
public function showRecentlyUpdated()
{
$pages = Page::visible()->orderBy('updated_at', 'desc')
$pages = Page::visible()->with('updatedBy')
->orderBy('updated_at', 'desc')
->paginate(20)
->setPath(url('/pages/recently-updated'));
@ -373,6 +374,7 @@ class PageController extends Controller
return view('common.detailed-listing-paginated', [
'title' => trans('entities.recently_updated_pages'),
'entities' => $pages,
'showUpdatedBy' => true,
]);
}

View file

@ -20,4 +20,13 @@
</div>
@endif
@if(($showUpdatedBy ?? false) && $entity->relationLoaded('updatedBy') && $entity->updatedBy)
<small title="{{ $entity->updated_at->toDayDateTimeString() }}">
{!! trans('entities.meta_updated_name', [
'timeLength' => $entity->updated_at->diffForHumans(),
'user' => e($entity->updatedBy->name)
]) !!}
</small>
@endif
@endcomponent

View file

@ -261,6 +261,21 @@ class PageTest extends TestCase
->assertElementContains('.entity-list .page:nth-child(1)', $content['page']->name);
}
public function test_recently_updated_pages_view_shows_updated_by_details()
{
$user = $this->getEditor();
/** @var Page $page */
$page = Page::query()->first();
$this->actingAs($user)->put($page->getUrl(), [
'name' => 'Updated title',
'html' => '<p>Updated content</p>',
]);
$resp = $this->asAdmin()->get('/pages/recently-updated');
$resp->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 1 second ago by ' . $user->name);
}
public function test_recently_updated_pages_on_home()
{
/** @var Page $page */