Updated user references to be app-default-supporting functions

diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index 48ae7d0f24302813b94cce18ef0645b3a9546d38..489963aad7cde7b361ffdecfcb4e7d7edb4e3301 100644 (file)
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -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);

     }
 
     /**
     }
 
     /**

diff --git a/resources/views/components/expand-toggle.blade.php b/resources/views/components/expand-toggle.blade.php
index 231b137410f59b178d74019ef5cd6526d2919a49..e8b2220e5cb981445a3666e629b9cfee0863968e 100644 (file)
--- a/resources/views/components/expand-toggle.blade.php
+++ b/resources/views/components/expand-toggle.blade.php
@@ -4,7 +4,7 @@ $key - Unique key for checking existing stored state.
 --}}
 <?php $isOpen = setting()->getForCurrentUser('section_expansion#'. $key); ?>
 <a expand-toggle="{{ $target }}"
 --}}
 <?php $isOpen = setting()->getForCurrentUser('section_expansion#'. $key); ?>
 <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' }}"
    class="text-muted icon-list-item text-primary">
     <span>@icon('expand-text')</span>
    expand-toggle-is-open="{{ $isOpen ? 'yes' : 'no' }}"
    class="text-muted icon-list-item text-primary">
     <span>@icon('expand-text')</span>