Merge pull request #36 from fbergkemper/master

some other quick fixes
bareos · Aug 27, 2014 · f79f1c0 · f79f1c0
2 parents da93789 + f97eef1
commit f79f1c0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -90,9 +90,9 @@ echo $this->doctype();
                 </div>
             </div>
         </nav>
-
-        <div class="container">
 
+        <div class="container">
+
     	<?php echo $this->content; ?>
 
         <hr />

diff --git a/module/Client/view/client/client/details.phtml b/module/Client/view/client/client/details.phtml
@@ -27,8 +27,19 @@ $this->headTitle($title);
 <tr><td><b>Autoprune</b></td><td><?php echo $this->escapeHtml($client->autoprune); ?></td></tr>
 <tr><td><b>Fileretention</b></td><td><?php echo $this->printRetention($client->fileretention) . " days"; ?></td></tr>
 <tr><td><b>Jobretention</b></td><td><?php echo $this->printRetention($client->jobretention) . " days"; ?></td></tr>
-<tr><td><b>Last successful backup</b></td><td><a href="<?php echo $this->url('job', array('action'=>'details', 'id' => $job->jobid)); ?>" title="<?php echo $job->endtime; ?>"><?php echo $this->printHumanReadableTimeperiod($job->endtime, "fuzzy")?> (Level: <?php echo $this->printJobLevel($job->level); ?>)</a></td></tr>
+
+<tr>
+<td><b>Last successful backup</b></td>
+<td>
+<?php if($job==null) : ?> never
+<?php elseif($job!=null) : ?>
+<a href="<?php echo $this->url('job', array('action'=>'details', 'id' => $job->jobid)); ?>" title="<?php echo $job->endtime; ?>"><?php echo $this->printHumanReadableTimeperiod($job->endtime, "fuzzy")?> (Level: <?php echo $this->printJobLevel($job->level); ?>)</a>
+<?php endif; ?>
+</td>
+</tr>
+
 <!-- <tr><td><b>Online status</b></td><td></td></tr> -->
+
 </table>
 
 </div>
@@ -72,6 +83,3 @@ $this->headTitle($title);
 </div>
 <!-- bconsoleOutput end -->
 
-</div>
-
-</div>
diff --git a/module/Job/src/Job/Model/JobTable.php b/module/Job/src/Job/Model/JobTable.php
@@ -487,7 +487,9 @@ public function getLastSuccessfulClientJob($id)
 		$row = $rowset->current();
 
 		if(!$row) {
-			throw new \Exception("Could not find row $jobid");
+			// Note: If there is no record, a job for this client was never executed.
+			// Exception: throw new \Exception("Could not find row $jobid");
+			$row = null;
 		}
 
 		return $row;