diff --git a/Changelog b/Changelog index bf0bfaf63..d2b4ad9b1 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2019-11-06 DariusIII + * Chg: Use the new remember() function for lazycollections 2019-10-28 DariusIII * Chg: Update tinyMCE to latest version * Fix: Fix return value of searchSimilar when no results are found diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index 210002301..14b226db4 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -18,7 +18,7 @@ class RoleController extends BasePageController $meta_title = $title = 'User Role List'; //get the user roles - $userroles = Role::cursor(); + $userroles = Role::cursor()->remember(); $this->smarty->assign('userroles', $userroles); @@ -126,7 +126,7 @@ class RoleController extends BasePageController $meta_title = $title = 'User Roles'; // Get the user roles. - $userRoles = Role::cursor(); + $userRoles = Role::cursor()->remember(); $roles = []; foreach ($userRoles as $userRole) { $roles[$userRole->id] = $userRole->name; diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index af83cc1fb..b6aaf8edd 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -23,7 +23,7 @@ class UserController extends BasePageController $meta_title = $title = 'User List'; $roles = []; - $userRoles = Role::cursor(); + $userRoles = Role::cursor()->remember(); foreach ($userRoles as $userRole) { $roles[$userRole->id] = $userRole->name; } @@ -100,7 +100,7 @@ class UserController extends BasePageController $action = $request->input('action') ?? 'view'; //get the user roles - $userRoles = Role::cursor(); + $userRoles = Role::cursor()->remember(); $roles = []; $defaultRole = 'User'; $defaultInvites = Invitation::DEFAULT_INVITES; diff --git a/app/Models/Settings.php b/app/Models/Settings.php index 3a3b87df4..2c24015e0 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -142,7 +142,7 @@ class Settings extends Model */ public static function toTree($excludeUnsectioned = true): array { - $results = self::cursor(); + $results = self::cursor()->remember(); $tree = []; if (! empty($results)) {