mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 21:21:27 +00:00
allow to add owner and logged in user to review/approve document
This commit is contained in:
parent
e1f2c63c2a
commit
0ec9c5977a
|
@ -36,6 +36,9 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
|
||||||
$user = $this->params['user'];
|
$user = $this->params['user'];
|
||||||
$folder = $this->params['folder'];
|
$folder = $this->params['folder'];
|
||||||
$enablelargefileupload = $this->params['enablelargefileupload'];
|
$enablelargefileupload = $this->params['enablelargefileupload'];
|
||||||
|
$enableadminrevapp = $this->params['enableadminrevapp'];
|
||||||
|
$enableownerrevapp = $this->params['enableownerrevapp'];
|
||||||
|
$enableselfrevapp = $this->params['enableselfrevapp'];
|
||||||
$strictformcheck = $this->params['strictformcheck'];
|
$strictformcheck = $this->params['strictformcheck'];
|
||||||
$dropfolderdir = $this->params['dropfolderdir'];
|
$dropfolderdir = $this->params['dropfolderdir'];
|
||||||
$folderid = $folder->getId();
|
$folderid = $folder->getId();
|
||||||
|
@ -87,7 +90,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
|
||||||
|
|
||||||
// Retrieve a list of all users and groups that have review / approve
|
// Retrieve a list of all users and groups that have review / approve
|
||||||
// privileges.
|
// privileges.
|
||||||
$docAccess = $folder->getReadAccessList();
|
$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
|
||||||
?>
|
?>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -209,13 +212,9 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
|
||||||
<div class="cbSelectContainer">
|
<div class="cbSelectContainer">
|
||||||
<ul class="cbSelectList">
|
<ul class="cbSelectList">
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
$res=$user->getMandatoryReviewers();
|
$res=$user->getMandatoryReviewers();
|
||||||
|
|
||||||
foreach ($docAccess["users"] as $usr) {
|
foreach ($docAccess["users"] as $usr) {
|
||||||
|
if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue;
|
||||||
if ($usr->getID()==$user->getID()) continue;
|
|
||||||
|
|
||||||
$mandatory=false;
|
$mandatory=false;
|
||||||
foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
|
foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
|
||||||
|
|
||||||
|
@ -248,11 +247,8 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
|
||||||
<ul class="cbSelectList">
|
<ul class="cbSelectList">
|
||||||
<?php
|
<?php
|
||||||
$res=$user->getMandatoryApprovers();
|
$res=$user->getMandatoryApprovers();
|
||||||
|
|
||||||
foreach ($docAccess["users"] as $usr) {
|
foreach ($docAccess["users"] as $usr) {
|
||||||
|
if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue;
|
||||||
if ($usr->getID()==$user->getID()) continue;
|
|
||||||
|
|
||||||
$mandatory=false;
|
$mandatory=false;
|
||||||
foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
|
foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user