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

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2024-11-11 09:36:11 +01:00
parent ca79b730ff
commit ea5d4651e5
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,43 +208,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$tasksinmenu = $this->params['tasksinmenu']; $tasksinmenu = $this->params['tasksinmenu'];
$startts = microtime(true);
$tasks = array();
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
}
if($workflowmode == 'traditional')
if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
}
if($workflowmode == 'advanced')
if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
}
header('Content-Type: application/json');
echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
} /* }}} */
/**
* Returns the html needed for the task list in the menu
*
* This function renders the tasks in a way suitable to be
* used as a menu
*
* @param array $clipboard clipboard containing two arrays for both
* documents and folders.
* @return string html code
*/
function countTasks() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
$workflowmode = $this->params['workflowmode'];
$tasksinmenu = $this->params['tasksinmenu'];
$startts = microtime(true); $startts = microtime(true);
$tasks = array(); $tasks = array();
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')