gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.1' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-09-20 13:45:33 +02:00
commit 58fdef13eb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.ViewDocument.php
View File

@ -71,6 +71,7 @@ if($view) {
$view->setParam('document', $document); $view->setParam('document', $document);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes); $view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('workflowmode', $settings->_workflowMode);
$view->show(); $view->show();

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

@ -79,6 +79,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$document = $this->params['document']; $document = $this->params['document'];
$accessop = $this->params['accessobject']; $accessop = $this->params['accessobject'];
$viewonlinefiletypes = $this->params['viewonlinefiletypes']; $viewonlinefiletypes = $this->params['viewonlinefiletypes'];
$enableownerrevapp = $this->params['enableownerrevapp'];
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$documentid = $document->getId(); $documentid = $document->getId();
@ -477,7 +478,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()) if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
$is_reviewer = true; $is_reviewer = true;
break; break;
case 1: // Reviewer is a group. case 1: // Reviewer is a group.
@ -487,7 +488,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())) if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
$is_reviewer = true; $is_reviewer = true;
} }
break; break;