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

do not output timeline if no data is available

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-22 10:32:33 +02:00
parent 109f814fa9
commit 6a91429711
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2018,6 +2018,8 @@ mayscript>
* @param object $document document * @param object $document document
*/ */
protected function printTimeline($timeline, $height=300, $start='', $end='') { /* {{{ */ protected function printTimeline($timeline, $height=300, $start='', $end='') { /* {{{ */
if(!$timeline)
return;
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var timeline; var timeline;

34
views/bootstrap/class.Timeline.php
View File

@ -87,23 +87,25 @@ echo "</div>\n";
echo "<div class=\"span9\">\n"; echo "<div class=\"span9\">\n";
$this->contentHeading(getMLText("timeline")); $this->contentHeading(getMLText("timeline"));
foreach($data as &$item) { if($data) {
switch($item['type']) { foreach($data as &$item) {
case 'add_version': switch($item['type']) {
$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'])); case 'add_version':
break; $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
case 'add_file': break;
$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()))); case 'add_file':
break; $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
case 'status_change': break;
$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status']))); case 'status_change':
break; $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
default: break;
$msg = '???'; default:
} $msg = '???';
$item['msg'] = $msg;
} }
$this->printTimeline($data, 550, date('Y-m-d', $from), date('Y-m-d', $to+1)); $item['msg'] = $msg;
}
$this->printTimeline($data, 550, date('Y-m-d', $from), date('Y-m-d', $to+1));
}
echo "</div>\n"; echo "</div>\n";
echo "</div>\n"; echo "</div>\n";

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

@ -1115,23 +1115,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin()) { if($user->isAdmin()) {
$this->contentHeading(getMLText("timeline")); $this->contentHeading(getMLText("timeline"));
$timeline = $document->getTimeline(); $timeline = $document->getTimeline();
foreach($timeline as &$item) { if($timeline) {
switch($item['type']) { foreach($timeline as &$item) {
case 'add_version': switch($item['type']) {
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'])); case 'add_version':
break; $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
case 'add_file': break;
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName())); case 'add_file':
break; $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
case 'status_change': break;
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status']))); case 'status_change':
break; $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
default: break;
$msg = '???'; default:
$msg = '???';
}
$item['msg'] = $msg;
} }
$item['msg'] = $msg; $this->printTimeline($timeline, 300, '', date('Y-m-d'));
} }
$this->printTimeline($timeline, 300, '', date('Y-m-d'));
} }
?> ?>
</div> </div>