From 230a21c2d1b721b72a3e661622a2128e9490a1ce Mon Sep 17 00:00:00 2001 From: Praesidiarius Date: Sun, 16 Feb 2020 16:02:47 +0100 Subject: [PATCH] next release --- composer.json | 2 +- .../Application/src/Controller/CoreEntityController.php | 9 +++++++++ module/Application/src/Module.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 88ea64e..54c0750 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "oneplace/oneplace-core", "description": "onePlace Core Application", "type": "project", - "version": "1.0.22", + "version": "1.0.21", "license": "BSD-3-Clause", "keywords": [ "laminas", diff --git a/module/Application/src/Controller/CoreEntityController.php b/module/Application/src/Controller/CoreEntityController.php index 9d978c1..f1da44e 100644 --- a/module/Application/src/Controller/CoreEntityController.php +++ b/module/Application/src/Controller/CoreEntityController.php @@ -132,6 +132,13 @@ public function generateIndexView($sKey,$aItems = [],$aWhereForce = []) } } + $sRoute = (isset($sRoute)) ? $sRoute : explode('-',$sKey)[0]; + + $aSavedSearches = CoreController::$aCoreTables['user-search']->select([ + 'user_idfs' => CoreController::$oSession->oUser->getID(), + 'list_name' => $sKey.'-index', + ]); + # Log Performance in DB $aMeasureEnd = getrusage(); $this->logPerfomance($sKey.'-index',$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"utime"),$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"stime")); @@ -140,6 +147,8 @@ public function generateIndexView($sKey,$aItems = [],$aWhereForce = []) 'sTableName' => $sKey.'-index', 'aItems' => $oPaginator, 'aFilters' => $aWhere, + 'aSavedSearches' => $aSavedSearches, + 'sRoute' => $sKey, ]); } diff --git a/module/Application/src/Module.php b/module/Application/src/Module.php index 1d4fe7e..623e186 100644 --- a/module/Application/src/Module.php +++ b/module/Application/src/Module.php @@ -27,7 +27,7 @@ class Module { * * @since 1.0.0 */ - const VERSION = '1.0.22'; + const VERSION = '1.0.21'; public function getConfig() : array { return include __DIR__ . '/../config/module.config.php';