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

pass $timeline instead of $document to printTimeline()

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-21 16:47:47 +02:00
parent fc909100d2
commit a7736397a8
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2017,8 +2017,7 @@ mayscript>
* *
* @param object $document document * @param object $document document
*/ */
protected function printTimeline($document) { /* {{{ */ protected function printTimeline($timeline, $height=300) { /* {{{ */
$timeline = $document->getTimeline();
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var timeline; var timeline;
@ -2027,20 +2026,7 @@ mayscript>
data = [ data = [
<?php <?php
foreach($timeline as $item) { foreach($timeline as $item) {
switch($item['type']) { echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."'},";
case 'add_version':
$msg = getMLText('timeline_'.$item['type'], array('version'=> $item['params'][0]));
break;
case 'add_file':
$msg = getMLText('timeline_'.$item['type']);
break;
case 'status_change':
$msg = getMLText('timeline_'.$item['type'], array('version'=> $item['params'][0], 'status'=> getOverallStatusText($item['params'][1])));
break;
default:
$msg = '???';
}
echo "{'start': new Date('".$item['date']."'), 'content': '".$msg."'},";
} }
?> ?>
{ {
@ -2052,7 +2038,7 @@ mayscript>
// specify options // specify options
var options = { var options = {
'width': '100%', 'width': '100%',
'height': '300px', 'height': '<?= $height ?>px',
'editable': false, // enable dragging and editing events 'editable': false, // enable dragging and editing events
'style': 'box', 'style': 'box',
'locale': 'de_DE' 'locale': 'de_DE'

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

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