gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 05:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

distinguish between no access and disabled users in check for receptions

Browse Source
This commit is contained in:
Uwe Steinmann 2024-02-05 16:15:18 +01:00
parent 89ce934164
commit 192daaec69
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
out/out.ObjectCheck.php
View File

@ -147,7 +147,8 @@ foreach($tmprevs as $rev) {
} }
} }
$docsinreception = array(); $docsinreceptionnoaccess = array();
$docsinreceptiondisabled = array();
if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInReceptionNoAccess') { if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInReceptionNoAccess') {
$tmprevs = $dms->getDocumentsInReception(); $tmprevs = $dms->getDocumentsInReception();
foreach($tmprevs as $rev) { foreach($tmprevs as $rev) {
@ -167,8 +168,10 @@ foreach($tmprevs as $rev) {
/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role /* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
* restrictions of the currently logged in user * restrictions of the currently logged in user
*/ */
if($mode < M_READ || $cmode < M_READ || $isdisabled) if($mode < M_READ || $cmode < M_READ)
$docsinreception[] = $doc; $docsinreceptionnoaccess[] = $doc;
if($isdisabled)
$docsinreceptiondisabled[] = $doc;
} }
} }
} }
@ -248,7 +251,8 @@ if($view) {
$view->setParam('duplicatesequences', $duplicatesequences); $view->setParam('duplicatesequences', $duplicatesequences);
$view->setParam('docsinrevision', $docsinrevision); $view->setParam('docsinrevision', $docsinrevision);
$view->setParam('docsmissingrevsiondate', $docsmissingrevsiondate); $view->setParam('docsmissingrevsiondate', $docsmissingrevsiondate);
$view->setParam('docsinreception', $docsinreception); $view->setParam('docsinreceptionnoaccess', $docsinreceptionnoaccess);
$view->setParam('docsinreceptiondisabled', $docsinreceptiondisabled);
$view->setParam('processwithoutusergroup', $processwithoutusergroup); $view->setParam('processwithoutusergroup', $processwithoutusergroup);
$view->setParam('unlink', $unlink); $view->setParam('unlink', $unlink);
$view->setParam('setfilesize', $setfilesize); $view->setParam('setfilesize', $setfilesize);

32
views/bootstrap/class.ObjectCheck.php
View File

@ -522,7 +522,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
$folder = $this->params['folder']; $folder = $this->params['folder'];
$docsinreception = $this->params['docsinreception']; $docsinreception = $this->params['docsinreceptionnoaccess'];
$conversionmgr = $this->params['conversionmgr']; $conversionmgr = $this->params['conversionmgr'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $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) { /* {{{ */ function listProcessesWithoutUserGroup($process, $ug) { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
@ -675,7 +699,8 @@ $(document).ready( function() {
$duplicateversions = $this->params['duplicateversions']; $duplicateversions = $this->params['duplicateversions'];
$duplicatesequences = $this->params['duplicatesequences']; $duplicatesequences = $this->params['duplicatesequences'];
$docsinrevision = $this->params['docsinrevision']; $docsinrevision = $this->params['docsinrevision'];
$docsinreception = $this->params['docsinreception']; $docsinreceptionnoaccess = $this->params['docsinreceptionnoaccess'];
$docsinreceptiondisabled = $this->params['docsinreceptiondisabled'];
$processwithoutusergroup = $this->params['processwithoutusergroup']; $processwithoutusergroup = $this->params['processwithoutusergroup'];
$docsmissingrevsiondate = $this->params['docsmissingrevsiondate']; $docsmissingrevsiondate = $this->params['docsmissingrevsiondate'];
$wrongfiletypeversions = $this->params['wrongfiletypeversions']; $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_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('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_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"))); $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('review', 'approval', 'receipt', 'revision') as $process) {
foreach(array('user', 'group') as $ug) { foreach(array('user', 'group') as $ug) {