Skip to content
Snippets Groups Projects
Commit b78d501d authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

FEAT #5628

parent b2986eb7
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ class HistoryModelAbstract extends Apps_Table_Service ...@@ -34,7 +34,7 @@ class HistoryModelAbstract extends Apps_Table_Service
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'], 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
'table' => ['history', 'users'], 'table' => ['history', 'users'],
'left_join' => ['history.user_id = users.user_id'], '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]+$'], 'data' => [$aArgs['id'], 'ACTION#%', '^[0-9]+$'],
'order_by' => empty($aArgs['orderBy']) ? ['event_date'] : $aArgs['orderBy'] 'order_by' => empty($aArgs['orderBy']) ? ['event_date'] : $aArgs['orderBy']
]); ]);
......
...@@ -142,7 +142,7 @@ if (isset($_REQUEST['load'])) { ...@@ -142,7 +142,7 @@ if (isset($_REQUEST['load'])) {
.".lastname, h.info FROM " .$_SESSION['tablename']['history'] .".lastname, h.info FROM " .$_SESSION['tablename']['history']
." h, ".$_SESSION['tablename']['users'] ." WHERE " ." h, ".$_SESSION['tablename']['users'] ." WHERE "
.$whereTableOrView." and h.record_id = ? and h.user_id = ".$_SESSION['tablename']['users'] .$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(); // $request->show();
$tab=array(); $tab=array();
......
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