From 6a91429711d28f9640c4d105e01a65cab1ccb20b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2015 10:32:33 +0200
Subject: [PATCH] do not output timeline if no data is available

---
 views/bootstrap/class.Bootstrap.php    |  2 ++
 views/bootstrap/class.Timeline.php     | 34 ++++++++++++++------------
 views/bootstrap/class.ViewDocument.php | 32 ++++++++++++------------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 888549489..778fdb37f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2018,6 +2018,8 @@ mayscript>
 	 * @param object $document document
 	 */
 	protected function printTimeline($timeline, $height=300, $start='', $end='') { /* {{{ */
+		if(!$timeline)
+			return;
 ?>
 	<script type="text/javascript">
 		var timeline;
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 7c67789c7..0b5f3eb8c 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -87,23 +87,25 @@ echo "</div>\n";
 
 echo "<div class=\"span9\">\n";
 $this->contentHeading(getMLText("timeline"));
-		foreach($data as &$item) {
-			switch($item['type']) {
-			case 'add_version':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
-				break;
-			case 'add_file':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
-				break;
-			case 'status_change':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-				break;
-			default:
-				$msg = '???';
-			}
-			$item['msg'] = $msg;
+if($data) {
+	foreach($data as &$item) {
+		switch($item['type']) {
+		case 'add_version':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+			break;
+		case 'add_file':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
+			break;
+		case 'status_change':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+			break;
+		default:
+			$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";
 
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 2782c41e1..d9e6173cd 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1115,23 +1115,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("timeline"));
 			$timeline = $document->getTimeline();
-			foreach($timeline as &$item) {
-				switch($item['type']) {
-				case 'add_version':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
-					break;
-				case 'add_file':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
-					break;
-				case 'status_change':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-					break;
-				default:
-					$msg = '???';
+			if($timeline) {
+				foreach($timeline as &$item) {
+					switch($item['type']) {
+					case 'add_version':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
+						break;
+					case 'add_file':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
+						break;
+					case 'status_change':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+						break;
+					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>