From f3076582906173d6e1ebd0c2d23741bbaa4005d4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 31 Jul 2017 14:16:45 +0200 Subject: [PATCH 1/2] do not remove from process when none is checked --- op/op.UsrMgr.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index 49d5be2c6..5583e5e0b 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -203,6 +203,10 @@ else if ($action == "removefromprocesses") { } if(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) { + if(!isset($_POST["status"]["review"])) + $_POST["status"]["review"] = array(); + if(!isset($_POST["status"]["approval"])) + $_POST["status"]["approval"] = array(); if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } From 2a4b8ffcfc84aa0264e3dda3ee4928ca83ee8f3b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 31 Jul 2017 14:17:41 +0200 Subject: [PATCH 2/2] remove from process only if status[review], status[approval] is not set --- SeedDMS_Core/Core/inc.ClassUser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 8e463986a..b8824b285 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -496,7 +496,7 @@ class SeedDMS_Core_User { /* {{{ */ $reviewStatus = $this->getReviewStatus(); foreach ($reviewStatus["indstatus"] as $ri) { - if($ri['status'] != -2 && (empty($states['review']) || in_array($ri['status'], $states['review']))) { + 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; @@ -509,7 +509,7 @@ class SeedDMS_Core_User { /* {{{ */ $approvalStatus = $this->getApprovalStatus(); foreach ($approvalStatus["indstatus"] as $ai) { - if($ai['status'] != -2 && (empty($states['approval']) || in_array($ai['status'], $states['approval']))) { + 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;