mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-08 20:46:05 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
596cb2afd6
|
@ -764,7 +764,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;
|
||||
|
@ -777,7 +777,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;
|
||||
|
|
|
@ -211,6 +211,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"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user