gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 2019-11-19 07:28:13 +01:00
commit 6f06faabc0
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
styles/bootstrap/application.js
View File

@ -1165,7 +1165,8 @@ $(document).ready(function() { /* {{{ */
(typeof data.data.revision != 'undefined' && revision_count != data.data.revision.length) || (typeof data.data.revision != 'undefined' && revision_count != data.data.revision.length) ||
(typeof data.data.needscorrection != 'undefined' && needscorrection_count != data.data.needscorrection.length) || (typeof data.data.needscorrection != 'undefined' && needscorrection_count != data.data.needscorrection.length) ||
(typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.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')
$('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder});
approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0; approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0; review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
receipt_count = typeof data.data.receipt != 'undefined' ? data.data.receipt.length : 0; receipt_count = typeof data.data.receipt != 'undefined' ? data.data.receipt.length : 0;

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

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

4
views/bootstrap/class.RemoveUserFromProcesses.php
View File

@ -54,6 +54,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
$reviewStatus = $rmuser->getReviewStatus(); $reviewStatus = $rmuser->getReviewStatus();
$tmpr = array(); $tmpr = array();
foreach($reviewStatus['indstatus'] as $ri) { foreach($reviewStatus['indstatus'] as $ri) {
$doc = $dms->getDocument($ri['documentID']);
$ri['latest'] = $doc->getLatestContent()->getVersion();
if(isset($tmpr[$ri['status']])) if(isset($tmpr[$ri['status']]))
$tmpr[$ri['status']][] = $ri; $tmpr[$ri['status']][] = $ri;
else else
@ -63,6 +65,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
$approvalStatus = $rmuser->getApprovalStatus(); $approvalStatus = $rmuser->getApprovalStatus();
$tmpa = array(); $tmpa = array();
foreach($approvalStatus['indstatus'] as $ai) { foreach($approvalStatus['indstatus'] as $ai) {
$doc = $dms->getDocument($ri['documentID']);
$ai['latest'] = $doc->getLatestContent()->getVersion();
if(isset($tmpa[$ai['status']])) if(isset($tmpa[$ai['status']]))
$tmpa[$ai['status']][] = $ai; $tmpa[$ai['status']][] = $ai;
else else

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

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

4
views/bootstrap/class.ViewDocument.php
View File

@ -402,6 +402,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<?php <?php
break; break;
case 'image/svg+xml': case 'image/svg+xml':
case 'image/jpg':
case 'image/jpeg':
case 'image/png':
case 'image/gif':
$this->contentHeading(getMLText("preview")); $this->contentHeading(getMLText("preview"));
?> ?>
<img src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%"> <img src="../op/op.ViewOnline.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">