mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-10-04 23:22:24 +00:00
do not take enableOwnerRe[vApp|cipt] into account
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:
parent
2bc839918a
commit
94dbc6b240
|
@ -680,7 +680,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
|
$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;
|
$is_reviewer = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -691,7 +691,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
|
$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;
|
$is_reviewer = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -762,7 +762,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
|
$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;
|
$is_approver = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1064,7 +1064,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
else {
|
else {
|
||||||
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
|
$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;
|
$is_recipient = true;
|
||||||
break;
|
break;
|
||||||
case 1: // Recipient is a group.
|
case 1: // Recipient is a group.
|
||||||
|
@ -1074,7 +1074,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
|
$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;
|
$is_recipient = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1181,7 +1181,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
else {
|
else {
|
||||||
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
|
$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;
|
$is_recipient = true;
|
||||||
break;
|
break;
|
||||||
case 1: // Reviewer is a group.
|
case 1: // Reviewer is a group.
|
||||||
|
@ -1191,7 +1191,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
|
$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;
|
$is_recipient = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user