From 23983081ea22bdc895776d70d2d0b1d8b80dd118 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 17:12:08 +0200
Subject: [PATCH] fix take over of approvers/reviewers from previous version

---
 views/bootstrap/class.UpdateDocument.php | 90 ++++++++++++++----------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 479d64c84..3122552e2 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -236,14 +236,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+					 	if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -285,24 +289,9 @@ function checkForm()
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
       </td>
-      <td>
+			<td>
         <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
-				$tmp = array();
-				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
-							$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->__takeOverButton("GrpReviewer", $tmp);
-				}
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
@@ -314,6 +303,25 @@ function checkForm()
 ?>
 			</select>
 <?php
+				$tmp = array();
+				foreach($reviewStatus as $r) {
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
+							$tmp[] = $r['required'];
+						}
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("GrpReviewer", $tmp);
+				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
 					$tmp = array();
@@ -375,14 +383,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -441,14 +453,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {