From d7a7b251fdc1d6db18d77a05bc08b43e03fe1d4a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Oct 2020 16:24:29 +0200 Subject: [PATCH 1/3] ? --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index d5c808de5..ad9cfe7d4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2674,7 +2674,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= count($links)."/".count($revlinks)." ".getMLText("linked_documents")."
"; if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') { $workflowstate = $latestContent->getWorkflowState(); - $content .= 'getName()).'">'.htmlspecialchars($workflowstate->getName()).''; + $content .= 'getName()) : '').'">'.($workflowstate ? htmlspecialchars($workflowstate->getName()) : '').''; } else { $content .= getOverallStatusText($status["status"]); } From d842b90f9e1ef7771772aab13489f33eadb62b1c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Oct 2020 17:06:06 +0200 Subject: [PATCH 2/3] set showtree for view --- out/out.MyDocuments.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index aa183d67a..fff285cdf 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -49,6 +49,7 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { } if($view) { + $view->setParam('showtree', showtree()); $view->setParam('orderby', $orderby); $view->setParam('showinprocess', $showInProcess); $view->setParam('workflowmode', $settings->_workflowMode); From a358d8565a4b4aa5afb53d88b881ebce349b9033 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Oct 2020 17:06:19 +0200 Subject: [PATCH 3/3] add list of rejected documents --- views/bootstrap/class.Tasks.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 6de76c080..cbc919f72 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -47,6 +47,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $tasks['review'] = array(); } elseif($workflowmode == 'advanced') $tasks['workflow'] = array(); + $tasks['rejected'] = array(); if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { $resArr = $dms->getDocumentList('ApproveByMe', $user); @@ -98,6 +99,21 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $tasks['workflow'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName()); } } + $resArr = $dms->getDocumentList('RejectOwner', $user); + if($resArr) { + $docs = array(); + foreach ($resArr as $res) { + $document = $dms->getDocument($res["id"]); + if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { + $docs[] = $document; + } + } + if($this->hasHook('filterRejectedTaskList')) + $docs = $this->callHook('filterRejectedTaskList', $docs); + foreach($docs as $doc) + $tasks['rejected'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName()); + } + return $tasks; } /* }}} */ @@ -152,6 +168,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $ct[] = count($tasks['approval']); if(isset($tasks['workflow'])) $ct[] = count($tasks['workflow']); + if(isset($tasks['rejected'])) + $ct[] = count($tasks['rejected']); $content .= implode('/', $ct); $content .= ")"; if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) { @@ -190,6 +208,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $content .= " \n"; $content .= " \n"; } + if(!empty($tasks['rejected'])) { + $content .= "
  • \n"; + $content .= " ".getMLText("documents_to_trigger_rejected")."\n"; + $content .= " \n"; + $content .= "
  • \n"; + } $content .= "
  • \n"; $content .= "
  • ".getMLText("my_documents")."
  • \n"; $content .= " \n";