github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-29 03:22:00 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Updated user references to be app-default-supporting functions

Browse Source
This commit is contained in:
Dan Brown
2019-04-14 13:19:33 +01:00
parent 9406b4d4c9
commit ee58bea8b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Settings/SettingService.php
View File

@ -75,7 +75,7 @@ class SettingService
*/ */
public function getForCurrentUser($key, $default = false) public function getForCurrentUser($key, $default = false)
{ {
return $this->getUser(auth()->user(), $key, $default); return $this->getUser(user(), $key, $default);
} }
/** /**

2
resources/views/components/expand-toggle.blade.php
View File

@ -4,7 +4,7 @@ $key - Unique key for checking existing stored state.
--}} --}}
<?php $isOpen = setting()->getForCurrentUser('section_expansion#'. $key); ?> <?php $isOpen = setting()->getForCurrentUser('section_expansion#'. $key); ?>
<a expand-toggle="{{ $target }}" <a expand-toggle="{{ $target }}"
expand-toggle-update-endpoint="{{ baseUrl('/settings/users/'. auth()->user()->id .'/update-expansion-preference/' . $key) }}" expand-toggle-update-endpoint="{{ baseUrl('/settings/users/'. $currentUser->id .'/update-expansion-preference/' . $key) }}"
expand-toggle-is-open="{{ $isOpen ? 'yes' : 'no' }}" expand-toggle-is-open="{{ $isOpen ? 'yes' : 'no' }}"
class="text-muted icon-list-item text-primary"> class="text-muted icon-list-item text-primary">
<span>@icon('expand-text')</span> <span>@icon('expand-text')</span>