From c32bff5074ebde9ad8c36b635b3c3e17d57d8216 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 13:21:01 +0200
Subject: [PATCH 1/2] separate removal of reviews and approval

---
 SeedDMS_Core/Core/inc.ClassUser.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 8e56fd4fa..8e463986a 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -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;

From c6a69f399b5759dff4e8bd5f49d48c56cb458e2c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 13:21:56 +0200
Subject: [PATCH 2/2] separate removal of reviews and approvals

---
 .../class.RemoveUserFromProcesses.php         | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 422f07a4c..f8cca27e3 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -69,29 +69,57 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				$tmpa[$ai['status']] = array($ai);
 		}
 ?>
-<?php if(isset($tmpa["0"]) || isset($tmpr["0"])) { ?>
+<?php if(isset($tmpr["0"])) { ?>
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('approvals_and_reviews_not_touched', array('no_approvals' => count($tmpa["0"]), 'no_reviews' => count($tmpr["0"]))); ?>
+	<input type="checkbox" name="status[review][]" value="0" checked> <?php echo getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))); ?>
 		</label>
 	</div>
 </div>
 <?php } ?>
-<?php if(isset($tmpa["1"]) || isset($tmpr["1"])) { ?>
+<?php if(isset($tmpr["1"])) { ?>
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('approvals_and_reviews_accepted', array('no_approvals' => count($tmpa["1"]), 'no_reviews' => count($tmpr["1"]))); ?><br />
+	<input type="checkbox" name="status[review][]" value="1"> <?php echo getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))); ?><br />
 		</label>
 	</div>
 </div>
 <?php } ?>
-<?php if(isset($tmpa["-1"]) || isset($tmpr["-1"])) { ?>
+<?php if(isset($tmpr["-1"])) { ?>
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('approvals_and_reviews_rejected', array('no_approvals' => count($tmpa["-1"]), 'no_reviews' => count($tmpr["-1"]))); ?><br />
+	<input type="checkbox" name="status[review][]" value="-1"> <?php echo getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+
+<?php if(isset($tmpa["0"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[approval][]" value="0" checked> <?php echo getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))); ?>
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpa["1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[approval][]" value="1"> <?php echo getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpa["-1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[approval][]" value="-1"> <?php echo getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))); ?><br />
 		</label>
 	</div>
 </div>