diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index e0b8067da..87a0918ca 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -147,7 +147,8 @@ foreach($tmprevs as $rev) { } } -$docsinreception = array(); +$docsinreceptionnoaccess = array(); +$docsinreceptiondisabled = array(); if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInReceptionNoAccess') { $tmprevs = $dms->getDocumentsInReception(); foreach($tmprevs as $rev) { @@ -167,8 +168,10 @@ foreach($tmprevs as $rev) { /* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role * restrictions of the currently logged in user */ - if($mode < M_READ || $cmode < M_READ || $isdisabled) - $docsinreception[] = $doc; + if($mode < M_READ || $cmode < M_READ) + $docsinreceptionnoaccess[] = $doc; + if($isdisabled) + $docsinreceptiondisabled[] = $doc; } } } @@ -248,7 +251,8 @@ if($view) { $view->setParam('duplicatesequences', $duplicatesequences); $view->setParam('docsinrevision', $docsinrevision); $view->setParam('docsmissingrevsiondate', $docsmissingrevsiondate); - $view->setParam('docsinreception', $docsinreception); + $view->setParam('docsinreceptionnoaccess', $docsinreceptionnoaccess); + $view->setParam('docsinreceptiondisabled', $docsinreceptiondisabled); $view->setParam('processwithoutusergroup', $processwithoutusergroup); $view->setParam('unlink', $unlink); $view->setParam('setfilesize', $setfilesize); diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 10c5f2377..85ce26c19 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -522,7 +522,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { $dms = $this->params['dms']; $user = $this->params['user']; $folder = $this->params['folder']; - $docsinreception = $this->params['docsinreception']; + $docsinreception = $this->params['docsinreceptionnoaccess']; $conversionmgr = $this->params['conversionmgr']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; @@ -542,6 +542,30 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { } } /* }}} */ + function listDocsInReceptionDisabled() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $docsinreception = $this->params['docsinreceptiondisabled']; + $conversionmgr = $this->params['conversionmgr']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewConverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); + + $this->contentHeading(getMLText("docs_in_revision_no_access")); + + if($docsinreception) { + $this->printList($docsinreception, $previewer, 'listDocsInReceptionDisabled'); + } + } /* }}} */ + function listProcessesWithoutUserGroup($process, $ug) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -675,7 +699,8 @@ $(document).ready( function() { $duplicateversions = $this->params['duplicateversions']; $duplicatesequences = $this->params['duplicatesequences']; $docsinrevision = $this->params['docsinrevision']; - $docsinreception = $this->params['docsinreception']; + $docsinreceptionnoaccess = $this->params['docsinreceptionnoaccess']; + $docsinreceptiondisabled = $this->params['docsinreceptiondisabled']; $processwithoutusergroup = $this->params['processwithoutusergroup']; $docsmissingrevsiondate = $this->params['docsmissingrevsiondate']; $wrongfiletypeversions = $this->params['wrongfiletypeversions']; @@ -710,7 +735,8 @@ $(document).ready( function() { $menuitems[] = array('label'=>getMLText('duplicate_content'), 'badge'=>count($duplicateversions), 'attributes'=>array(array('data-href', "#duplicate_content"), array('data-action', "listDuplicateContent"))); $menuitems[] = array('label'=>getMLText('duplicate_sequences'), 'badge'=>count($duplicatesequences), 'attributes'=>array(array('data-href', "#duplicate_sequences"), array('data-action', "listDuplicateSequence"))); $menuitems[] = array('label'=>getMLText('docs_in_revision_no_access'), 'badge'=>count($docsinrevision), 'attributes'=>array(array('data-href', "#inrevision_no_access"), array('data-action', "listDocsInRevisionNoAccess"))); - $menuitems[] = array('label'=>getMLText('docs_in_reception_no_access'), 'badge'=>count($docsinreception), 'attributes'=>array(array('data-href', "#inreception_no_access"), array('data-action', "listDocsInReceptionNoAccess"))); + $menuitems[] = array('label'=>getMLText('docs_in_reception_no_access'), 'badge'=>count($docsinreceptionnoaccess), 'attributes'=>array(array('data-href', "#inreception_no_access"), array('data-action', "listDocsInReceptionNoAccess"))); + $menuitems[] = array('label'=>getMLText('docs_in_reception_disabled'), 'badge'=>count($docsinreceptiondisabled), 'attributes'=>array(array('data-href', "#inreception_disabled"), array('data-action', "listDocsInReceptionDisabled"))); $menuitems[] = array('label'=>getMLText('docs_with_missing_revision_date'), 'badge'=>count($docsmissingrevsiondate), 'attributes'=>array(array('data-href', "#missing_revision_date"), array('data-action', "listDocsWithMissingRevisionDate"))); foreach(array('review', 'approval', 'receipt', 'revision') as $process) { foreach(array('user', 'group') as $ug) {