gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix take over of reviewer/approver from previous version

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-17 12:21:25 +02:00
parent 42ce9fa21b
commit 3ed43b0a85
1 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
views/bootstrap/class.CheckInDocument.php
View File

@ -236,14 +236,18 @@ function checkForm()
<?php <?php
$tmp = array(); $tmp = array();
foreach($reviewStatus as $r) { foreach($reviewStatus as $r) {
$mandatory=false; if($r['type'] == 0) {
if($r['type'] == 0 && $res) { if($res) {
foreach ($res as $rr) $mandatory=false;
if ($rr['reviewerUserID']==$r['required']) { foreach ($res as $rr)
$mandatory=true; if ($rr['reviewerUserID']==$r['required']) {
} $mandatory=true;
if(!$mandatory) }
if(!$mandatory)
$tmp[] = $r['required'];
} else {
$tmp[] = $r['required']; $tmp[] = $r['required'];
}
} }
} }
if($tmp) { if($tmp) {
@ -288,21 +292,6 @@ function checkForm()
<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'); ?>"> <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 <?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) { foreach ($docAccess["groups"] as $grp) {
$mandatory=false; $mandatory=false;
@ -314,6 +303,25 @@ function checkForm()
?> ?>
</select> </select>
<?php <?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 */ /* List all mandatory groups of reviewers */
if($res) { if($res) {
$tmp = array(); $tmp = array();
@ -375,14 +383,18 @@ function checkForm()
<?php <?php
$tmp = array(); $tmp = array();
foreach($approvalStatus as $r) { foreach($approvalStatus as $r) {
$mandatory=false; if($r['type'] == 0) {
if($r['type'] == 0 && $res) { if($res) {
foreach ($res as $rr) $mandatory=false;
if ($rr['approverUserID']==$r['required']) { foreach ($res as $rr)
$mandatory=true; if ($rr['approverUserID']==$r['required']) {
} $mandatory=true;
if(!$mandatory) }
if(!$mandatory)
$tmp[] = $r['required'];
} else {
$tmp[] = $r['required']; $tmp[] = $r['required'];
}
} }
} }
if($tmp) { if($tmp) {
@ -441,14 +453,18 @@ function checkForm()
<?php <?php
$tmp = array(); $tmp = array();
foreach($approvalStatus as $r) { foreach($approvalStatus as $r) {
$mandatory=false; if($r['type'] == 1) {
if($r['type'] == 1 && $res) { if($res) {
foreach ($res as $rr) $mandatory=false;
if ($rr['approverGroupID']==$r['required']) { foreach ($res as $rr)
$mandatory=true; if ($rr['approverGroupID']==$r['required']) {
} $mandatory=true;
if(!$mandatory) }
if(!$mandatory)
$tmp[] = $r['required'];
} else {
$tmp[] = $r['required']; $tmp[] = $r['required'];
}
} }
} }
if($tmp) { if($tmp) {