From b78d501d3eac1a717f8cc2b7358b6e90fa751936 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Thu, 29 Jun 2017 11:24:41 +0200
Subject: [PATCH] FEAT #5628
---
apps/maarch_entreprise/Models/HistoryModelAbstract.php | 2 +-
.../indexing_searching/document_workflow_history.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/maarch_entreprise/Models/HistoryModelAbstract.php b/apps/maarch_entreprise/Models/HistoryModelAbstract.php
index a9a97e4f88c..da17969cbcf 100644
--- a/apps/maarch_entreprise/Models/HistoryModelAbstract.php
+++ b/apps/maarch_entreprise/Models/HistoryModelAbstract.php
@@ -34,7 +34,7 @@ class HistoryModelAbstract extends Apps_Table_Service
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
'table' => ['history', 'users'],
'left_join' => ['history.user_id = users.user_id'],
- 'where' => ['history.record_id = ?', 'history.event_type like ?', 'history.event_id ~ ?'],
+ 'where' => ['history.record_id = ?', 'history.event_type like ?', 'history.event_id NOT LIKE ?'],
'data' => [$aArgs['id'], 'ACTION#%', '^[0-9]+$'],
'order_by' => empty($aArgs['orderBy']) ? ['event_date'] : $aArgs['orderBy']
]);
diff --git a/apps/maarch_entreprise/indexing_searching/document_workflow_history.php b/apps/maarch_entreprise/indexing_searching/document_workflow_history.php
index c53ddb7752f..b69be4eda4f 100644
--- a/apps/maarch_entreprise/indexing_searching/document_workflow_history.php
+++ b/apps/maarch_entreprise/indexing_searching/document_workflow_history.php
@@ -142,7 +142,7 @@ if (isset($_REQUEST['load'])) {
.".lastname, h.info FROM " .$_SESSION['tablename']['history']
." h, ".$_SESSION['tablename']['users'] ." WHERE "
.$whereTableOrView." and h.record_id = ? and h.user_id = ".$_SESSION['tablename']['users']
- .".user_id".$where." and event_id ~ '^[0-9]+$' and event_type like 'ACTION#%' ".$orderstr, array($id));
+ .".user_id".$where." and event_id NOT LIKE '^[0-9]+$' and event_type like 'ACTION#%' ".$orderstr, array($id));
// $request->show();
$tab=array();
--
GitLab