lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX only check on busy resources before updating an event

Browse Source
This commit is contained in:
VESSILLER 2019-09-05 09:29:40 +02:00
parent b70587c150
commit 4ef7e755ad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/comm/action/card.php
View File

@ -524,9 +524,10 @@ if ($action == 'update')
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
$sql .= " WHERE ac.id != " . $object->id;
$sql .= " AND er.resource_id IN (";
$sql .= " SELECT resource_id FROM " . MAIN_DB_PREFIX . "element_resources as er";
$sql .= " WHERE er.element_id = " . $object->id;
$sql .= " AND er.element_type = '" . $db->escape($object->element) . "'";
$sql .= " SELECT resource_id FROM " . MAIN_DB_PREFIX . "element_resources";
$sql .= " WHERE element_id = " . $object->id;
$sql .= " AND element_type = '" . $db->escape($object->element) . "'";
$sql .= " AND busy = 1";
$sql .= ")";
$sql .= " AND er.busy = 1";
$sql .= " AND (";

1
htdocs/resource/element_resource.php
View File

@ -202,6 +202,7 @@ if (empty($reshook))
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($object->resource_type) . "'";
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element_type) . "'";
$sql .= " WHERE er.resource_id = " . $object->resource_id;
$sql .= " AND ac.id != " . $object->element_id;
$sql .= " AND er.busy = 1";
$sql .= " AND (";