menuTasks returns complete menuItem

This commit is contained in:
Uwe Steinmann 2019-11-12 15:22:00 +01:00
parent 4f28cd19d1
commit 28e2549866
3 changed files with 10 additions and 9 deletions

View File

@ -1162,7 +1162,7 @@ $(document).ready(function() { /* {{{ */
if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) ||
(typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
(typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
$("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;

View File

@ -336,11 +336,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if($this->params['enablemenutasks']) {
echo " <div id=\"menu-tasks\">";
echo " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
echo " <li class=\"dropdown\">\n";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
// echo " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
// echo " <li class=\"dropdown\">\n";
// echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
echo " </li>\n";
echo " </ul>\n";
// echo " </li>\n";
// echo " </ul>\n";
echo " </div>";
//$this->addFooterJS('checkTasks();');
}

View File

@ -138,8 +138,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$tasks = $this->__myTasks();
$content = '';
// $content .= " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
// $content .= " <li class=\"dropdown\">\n";
$content .= " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
$content .= " <li class=\"dropdown\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (";
$ct = array();
if(isset($tasks['review']))
@ -190,8 +190,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$content .= " <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
$content .= " </ul>\n";
}
// $content .= " </li>\n";
// $content .= " </ul>\n";
$content .= " </li>\n";
$content .= " </ul>\n";
echo $content;
} /* }}} */