Skip to content
Snippets Groups Projects
Verified Commit 75ba6eb6 authored by Damien's avatar Damien
Browse files

FIX Viewed listinstance + postSet feature

parent 4c5de21d
No related branches found
No related tags found
No related merge requests found
......@@ -138,14 +138,15 @@ abstract class ListInstanceModelAbstract
public static function update(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['set', 'where', 'data']);
ValidatorModel::arrayType($aArgs, ['set', 'where', 'data']);
ValidatorModel::notEmpty($aArgs, ['where', 'data']);
ValidatorModel::arrayType($aArgs, ['set', 'postSet', 'where', 'data']);
DatabaseModel::update([
'table' => 'listinstance',
'set' => $aArgs['set'],
'where' => $aArgs['where'],
'data' => $aArgs['data']
'table' => 'listinstance',
'set' => $aArgs['set'],
'postSet' => $aArgs['postSet'],
'where' => $aArgs['where'],
'data' => $aArgs['data']
]);
return true;
......
......@@ -23,6 +23,7 @@ use Convert\models\AdrModel;
use Docserver\models\DocserverModel;
use Docserver\models\DocserverTypeModel;
use Docserver\models\ResDocserverModel;
use Entity\models\ListInstanceModel;
use Group\controllers\GroupController;
use Group\models\GroupModel;
use Group\models\ServiceModel;
......@@ -368,6 +369,11 @@ class ResController
$response->write($fileContent);
$response = $response->withAddedHeader('Content-Disposition', "inline; filename=maarch.{$pathInfo['extension']}");
ListInstanceModel::update([
'postSet' => ['viewed' => 'viewed + 1'],
'where' => ['item_id = ?', 'item_mode = ?', 'res_id = ?'],
'data' => [$GLOBALS['userId'], 'cc', $aArgs['resId']]
]);
HistoryController::add([
'tableName' => 'res_letterbox',
'recordId' => $aArgs['resId'],
......
......@@ -195,9 +195,9 @@ class DatabaseModel
*/
public static function update(array $args)
{
ValidatorModel::notEmpty($args, ['table', 'set', 'where']);
ValidatorModel::notEmpty($args, ['table', 'where']);
ValidatorModel::stringType($args, ['table']);
ValidatorModel::arrayType($args, ['set', 'where']);
ValidatorModel::arrayType($args, ['set', 'where', 'postSet']);
if (empty($args['data'])) {
$args['data'] = [];
......@@ -206,12 +206,19 @@ class DatabaseModel
$querySet = [];
$dataSet = [];
foreach ($args['set'] as $key => $value) {
if ($value == 'SYSDATE' || $value == 'CURRENT_TIMESTAMP') {
if (!empty($args['set'])) {
foreach ($args['set'] as $key => $value) {
if ($value == 'SYSDATE' || $value == 'CURRENT_TIMESTAMP') {
$querySet[] = "{$key} = {$value}";
} else {
$querySet[] = "{$key} = ?";
$dataSet[] = $value;
}
}
}
if (!empty($args['postSet'])) {
foreach ($args['postSet'] as $key => $value) {
$querySet[] = "{$key} = {$value}";
} else {
$querySet[] = "{$key} = ?";
$dataSet[] = $value;
}
}
$args['data'] = array_merge($dataSet, $args['data']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment