gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-10-23 17:56:11 +02:00
commit 5a166d6a2b
4 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.MyDocuments.php
View File

@ -57,6 +57,7 @@ if (!empty($_GET["orderdir"])) {
}
if($view) {
$view->setParam('showtree', showtree());
$view->setParam('orderby', $orderby);
$view->setParam('orderdir', $orderdir);
$view->setParam('showtree', showtree());

1
views/bootstrap/class.Bootstrap.php
View File

@ -832,6 +832,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
private function adminToolsNavigationBar() { /* {{{ */
$accessobject = $this->params['accessobject'];
$settings = $this->params['settings'];
echo " <id=\"first\"><a href=\"../out/out.AdminTools.php\" class=\"brand\">".getMLText("admin_tools")."</a>\n";
echo "<div class=\"nav-collapse col2\">\n";
echo " <ul class=\"nav\">\n";

2
views/bootstrap/class.Settings.php
View File

@ -324,7 +324,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
<?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
<?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
<?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>
<?php $this->showConfigOption('settings_tasksInMenu', 'tasksInMenu', array('review'=>'settings_tasksInMenu_review', 'approval'=>'settings_tasksInMenu_approval', 'workflow'=>'settings_tasksInMenu_workflow', 'receipt'=>'settings_tasksInMenu_receipt', 'revision'=>'settings_tasksInMenu_revision', 'needscorrection'=>'settings_tasksInMenu_needscorrection'), true, true); ?>
<?php $this->showConfigOption('settings_tasksInMenu', 'tasksInMenu', array('review'=>'settings_tasksInMenu_review', 'approval'=>'settings_tasksInMenu_approval', 'workflow'=>'settings_tasksInMenu_workflow', 'receipt'=>'settings_tasksInMenu_receipt', 'revision'=>'settings_tasksInMenu_revision', 'needscorrection'=>'settings_tasksInMenu_needscorrection', 'rejected'=>'settings_tasksInMenu_rejected', 'checkedout'=>'settings_tasksInMenu_checkedout'), true, true); ?>
<?php $this->showConfigCheckbox('settings_enableDropFolderList', 'enableDropFolderList'); ?>
<?php $this->showConfigCheckbox('settings_enableSessionList', 'enableSessionList'); ?>
<?php $this->showConfigCheckbox('settings_enableDropUpload', 'enableDropUpload'); ?>

67
views/bootstrap/class.Tasks.php
View File

@ -50,6 +50,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$tasks['review'] = array();
} elseif($workflowmode == 'advanced')
$tasks['workflow'] = array();
$tasks['rejected'] = array();
$tasks['checkedout'] = array();
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
@ -159,6 +161,40 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$tasks['workflow'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
}
if(!$tasksinmenu || in_array('rejected', $tasksinmenu)) {
$tasks['rejected'] = array();
$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());
}
}
if(!$tasksinmenu || in_array('checkedout', $tasksinmenu)) {
$tasks['checkedout'] = array();
$resArr = $dms->getDocumentList('CheckedOutByMe', $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('filterCheckedOutTaskList'))
$docs = $this->callHook('filterCheckedOutTaskList', $docs);
foreach($docs as $doc)
$tasks['checkedout'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
}
return $tasks;
} /* }}} */
@ -258,9 +294,13 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$ct[] = count($tasks['revision']);
if(isset($tasks['needscorrection']))
$ct[] = count($tasks['needscorrection']);
if(isset($tasks['rejected']))
$ct[] = count($tasks['rejected']);
if(isset($tasks['checkedout']))
$ct[] = count($tasks['checkedout']);
$content .= implode('/', $ct);
$content .= ")";
if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) {
if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected'])) {
$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
if(!empty($tasks['review'])) {
@ -329,12 +369,33 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$content .= " </ul>\n";
$content .= " </li>\n";
}
if(!empty($tasks['rejected'])) {
$content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_user_rejected")."</a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
foreach($tasks['rejected'] as $t) {
$doc = $dms->getDocument($t['id']);
$content .= " <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
}
$content .= " </ul>\n";
$content .= " </li>\n";
}
if(!empty($tasks['checkedout'])) {
$content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_checked_out_by_you")."</a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
foreach($tasks['checkedout'] as $t) {
$doc = $dms->getDocument($t['id']);
$content .= " <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
}
$content .= " </ul>\n";
$content .= " </li>\n";
}
}
if ($accessobject->check_view_access('MyDocuments')) {
$content .= " <li class=\"divider\"></li>\n";
$content .= " <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
}
$content .= " </ul>\n";
}
$content .= " </li>\n";
$content .= " </ul>\n";
echo $content;