From e40ae9b3b4fcf2040c3dafbc515715ba4cfc538f Mon Sep 17 00:00:00 2001
From: Derrick Isaacson <disaacson@gmail.com>
Date: Tue, 24 Dec 2013 14:14:50 -0700
Subject: [PATCH] Try to fix null pointer exceptions on some platforms in
 trigger/job views.

---
 .../com/lucidchart/piezo/admin/views/editTrigger.scala.html   | 1 +
 admin/app/com/lucidchart/piezo/admin/views/job.scala.html     | 4 +++-
 admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html b/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html
index 79055c2..5176460 100644
--- a/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html
+++ b/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html
@@ -80,5 +80,6 @@ <h4 class="text-danger">@triggerForm.errors.filter(_.key == "").map(_.message).m
     </div>
     <div class="clearfix"></div>
     <button type="submit" class="btn btn-default submit-btn">@submitValue</button>
+    <button type="button" class="btn btn-default submit-btn" onclick="history.back();" value="Cancel">Cancel</button>
   </form>
 }
\ No newline at end of file
diff --git a/admin/app/com/lucidchart/piezo/admin/views/job.scala.html b/admin/app/com/lucidchart/piezo/admin/views/job.scala.html
index 3d4f846..215235d 100644
--- a/admin/app/com/lucidchart/piezo/admin/views/job.scala.html
+++ b/admin/app/com/lucidchart/piezo/admin/views/job.scala.html
@@ -25,7 +25,9 @@ <h3>@currentJob.get.getKey.getGroup() &raquo; <span class="text-info">@currentJo
             </tr>
             <tr>
                 <td class="text-right">Description</td>
-                <td>@currentJob.get.getDescription()</td>
+                <td>
+                    @if(currentJob.get.getDescription() != null) {@currentJob.get.getDescription()} else {}
+                </td>
             </tr>
             <tr>
                 <td class="text-right small">Durable</td>
diff --git a/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html b/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html
index f0a7b24..a807662 100644
--- a/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html
+++ b/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html
@@ -110,7 +110,9 @@ <h4>This will permanently delete the trigger!</h4>
             }
             <tr>
                 <td class="text-right">Description:</td>
-                <td>@currentTrigger.get.getDescription()</td>
+                <td>
+                    @if(currentTrigger.get.getDescription() != null) {@currentTrigger.get.getDescription()} else {}
+                </td>
             </tr>
             <tr>
                 <td class="text-right small">End time:</td>