Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2016-10-27 17:07:22 +02:00
commit 58bee377a0

View File

@ -639,7 +639,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;
@ -650,7 +650,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;
@ -719,7 +719,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;