Rerun fix

Removes rerun functionality from restore jobs.

3 files changed, 22 insertions, 8 deletions

diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
index fdb4466..38ea97c 100644
--- a/module/Job/view/job/job/index.phtml
+++ b/module/Job/view/job/job/index.phtml
@@ -122,7 +122,6 @@ Jobs per page:
 			<li class="divider"></li>
 		<?php if($job->jobstatus == "T") : ?>
 			<li><a href="<?php echo $this->url('job', array('action' => 'rerun', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("Rerun"); ?>"><span class="glyphicon glyphicon-repeat"></span> Re-run job</a></li>
-			<!-- <li><a href="<?php ?>" title="<?php echo $this->translate("Restore"); ?>"><span class="glyphicon glyphicon-import"></span> Restore job</a></li> -->
 		<?php elseif($job->jobstatus == "E" || $job->jobstatus == "e" || $job->jobstatus == "f" || $job->jobstatus == "A") : ?>
 			<li><a href="<?php echo $this->url('job', array('action' => 'rerun', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("Rerun"); ?>"><span class="glyphicon glyphicon-repeat"></span> Re-run job</a></li>
 		<?php else : ?>
@@ -131,6 +130,18 @@ Jobs per page:
 		</ul>
 	</div>
 	<?php endif; ?>
+	<?php if($job->type == "R") : ?>
+        <div class="btn-group">
+                <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-cog"></span></button>
+                <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                        <span class="sr-only">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu" role="menu">
+                        <li><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("View logs"); ?>"><span class="glyphicon glyphicon-file"></span> View messages</a></li>
+                </ul>
+        </div>
+        <?php endif; ?>
 	</td>
 	
 </tr>
diff --git a/module/Job/view/job/job/successful.phtml b/module/Job/view/job/job/successful.phtml
index 0172dd7..f03c488 100644
--- a/module/Job/view/job/job/successful.phtml
+++ b/module/Job/view/job/job/successful.phtml
@@ -130,7 +130,7 @@ Jobs per page:
 	<td><?php echo $this->printBytes($job->jobbytes); ?></td>
 	<td><?php echo $this->printJobStatus($job->jobstatus); ?></td>
 	<td>
-	
+
 	<div class="btn-group">
 		<button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-cog"></span></button>
 		<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
@@ -139,13 +139,14 @@ Jobs per page:
 		</button>
 		<ul class="dropdown-menu" role="menu">
 			<li><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("View messages"); ?>"><span class="glyphicon glyphicon-file"></span> View messages</a></li>
+			<?php if($job->type != "R") : ?>
 			<li class="divider"></li>
 			<li><a href="<?php echo $this->url('job', array('action' => 'rerun', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("Rerun"); ?>"><span class="glyphicon glyphicon-repeat"></span> Re-run job</a></li>
-			<!-- <li><a href="<?php ?>" title="<?php echo $this->translate("Restore"); ?>"><span class="glyphicon glyphicon-import"></span> Restore job</a></li> -->
+			<?php endif; ?>
 		</ul>
 	</div>
 	</td>
-	
+
 </tr>
 
 <?php endforeach; ?>
diff --git a/module/Job/view/job/job/unsuccessful.phtml b/module/Job/view/job/job/unsuccessful.phtml
index 084c233..2451fd0 100644
--- a/module/Job/view/job/job/unsuccessful.phtml
+++ b/module/Job/view/job/job/unsuccessful.phtml
@@ -134,13 +134,15 @@ Jobs per page:
 		</button>
 		<ul class="dropdown-menu" role="menu">
 			<li><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("View messages"); ?>"><span class="glyphicon glyphicon-file"></span> View messages</a></li>
+			<?php if($job->type != "R") : ?>
 			<li class="divider"></li>
 			<li><a href="<?php echo $this->url('job', array('action' => 'rerun', 'id' => $job->jobid)); ?>" title="<?php echo $this->translate("Rerun"); ?>"><span class="glyphicon glyphicon-repeat"></span> Re-run job</a></li>
+			<?php endif; ?>
 		</ul>
-	</div>	
+	</div>
+
+	</td>
 
-	</td>	
-	
 </tr>
 
 <?php endforeach; ?>
@@ -153,7 +155,7 @@ Jobs per page:
 <?php
 
 echo $this->paginationControl(
-			$this->paginator, 
+			$this->paginator,
 			'Elastic',
 			array('partial/paginator.phtml', 'Job'),
 			array('route' => 'job')