separate removal of reviews and approval

This commit is contained in:
Uwe Steinmann 2017-07-31 13:21:01 +02:00
parent 485a6f7651
commit c32bff5074

View File

@ -496,9 +496,10 @@ class SeedDMS_Core_User { /* {{{ */
$reviewStatus = $this->getReviewStatus();
foreach ($reviewStatus["indstatus"] as $ri) {
if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
if($ri['status'] != -2 && (empty($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;
@ -508,9 +509,10 @@ class SeedDMS_Core_User { /* {{{ */
$approvalStatus = $this->getApprovalStatus();
foreach ($approvalStatus["indstatus"] as $ai) {
if($ai['status'] != -2 && (!$states || in_array($ai['status'], $states))) {
if($ai['status'] != -2 && (empty($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;