gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove from process only if status[receipt], status[revision] is not set

Browse Source
This commit is contained in:
Uwe Steinmann 2017-07-31 14:21:24 +02:00
parent 596cb2afd6
commit 7b5412ff36
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -767,7 +767,6 @@ class SeedDMS_Core_User { /* {{{ */
if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
echo $queryStr;
$res=$db->getResult($queryStr);
if(!$res) {
return false;
@ -780,7 +779,6 @@ class SeedDMS_Core_User { /* {{{ */
if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
echo $queryStr;
$res=$db->getResult($queryStr);
if(!$res) {
return false;
@ -790,7 +788,7 @@ class SeedDMS_Core_User { /* {{{ */
$receiptStatus = $this->getReceiptStatus();
foreach ($receiptStatus["indstatus"] as $ri) {
if($ri['status'] != -2 && (empty($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
$res=$db->getResult($queryStr);
@ -802,7 +800,7 @@ class SeedDMS_Core_User { /* {{{ */
$revisionStatus = $this->getRevisionStatus();
foreach ($revisionStatus["indstatus"] as $ri) {
if($ri['status'] != -2 && (empty($states['revision']) || in_array($ri['status'], $states['revision']))) {
if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
$res=$db->getResult($queryStr);