Try to fix null pointer exceptions on some platforms in trigger/job v…

…iews.
lucidsoftware · Dec 24, 2013 · e40ae9b · e40ae9b
1 parent 2c587d7
commit e40ae9b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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>
 }
diff --git 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
@@ -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>