Merge pull request #39 from StrictlySkyler/bug/37/new-instance-no-lan…

…es-never-loads bug/37/new-instance-no-lanes-never-loads
StrictlySkyler · Jul 1, 2018 · 4a75753 · 4a75753
2 parents 84cf01f + d3aaf55
commit 4a75753
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/imports/ui/pages/lanes/helpers.js b/imports/ui/pages/lanes/helpers.js
@@ -26,11 +26,13 @@ Template.lanes.helpers({
     let total = Session.get('total_lanes');
     let current = Lanes.find().count();
 
-    if (! total || current < total) return true;
+    if (total !== 0 && ! total || current < total) return true;
 
     return false;
   },
 
+  empty () { return Session.get('total_lanes') === 0; },
+
   lanes () {
     let lanes;
     let sort_by = Session.get('lanes_table_sort_by');

diff --git a/imports/ui/pages/lanes/lanes.html b/imports/ui/pages/lanes/lanes.html
@@ -30,6 +30,12 @@ <h1>Lanes</h1>
         </tr>
       {{/if}}
 
+      {{#if empty}}
+        <tr class="empty">
+          <td colspan=9>No lanes found.  <a href="/lanes/new/edit">Create the first.</a></td>
+        </tr>
+      {{/if}}
+
       {{#each lanes}}
         <tr>
           <td class="name-column">

diff --git a/imports/ui/pages/lanes/lib/util.js b/imports/ui/pages/lanes/lib/util.js
@@ -1,6 +1,6 @@
 import { Shipments } from '../../../../api/shipments';
 
-const count = (lane) => {
+const count = (lane = { _id: false }) => {
   return Shipments.find({ lane: lane._id }).count();
 };