gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not take enableOwnerRe[vApp|cipt] into account

Browse Source 
if a user has been assigen as Reviewer/Approver/Revisor and became
the owner of the document in the mean timer or the configuration has
change he/she should still be able to do the review/approval/revision
This commit is contained in:
Uwe Steinmann 2016-10-27 14:23:26 +02:00
parent 2bc839918a
commit 94dbc6b240
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
views/bootstrap/class.ViewDocument.php
View File

@ -680,7 +680,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
else {
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
if($required->getId() == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
if($required->getId() == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
$is_reviewer = true;
}
break;
@ -691,7 +691,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
$is_reviewer = true;
}
break;
@ -762,7 +762,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
$is_approver = true;
}
break;
@ -1064,7 +1064,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
else {
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
}
if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
$is_recipient = true;
break;
case 1: // Recipient is a group.
@ -1074,7 +1074,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
$is_recipient = true;
}
break;
@ -1181,7 +1181,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
else {
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
}
if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
$is_recipient = true;
break;
case 1: // Reviewer is a group.
@ -1191,7 +1191,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
$is_recipient = true;
}
break;