Nil check

malmostad · Jun 1, 2018 · 6d832fc · 6d832fc
1 parent a7f16b2
commit 6d832fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/company.rb b/app/models/company.rb
@@ -22,6 +22,7 @@ def present_bookings
   end
 
   def active_permit?
-    permit_starts_at <= Date.today && permit_ends_at >= Date.today
+    permit_starts_at.present? && permit_ends_at.present? &&
+        permit_starts_at <= Date.today && permit_ends_at >= Date.today
   end
 end
diff --git a/public/500.html b/public/500.html
@@ -16,8 +16,7 @@
     </style>
   </head>
   <body>
-    <h1>Vi är ledsna, ett serverfel uppstod</h1>
-    <p>Försök åter om en liten stund</p>
+    <h1>Ett serverfel uppstod</h1>
     <p class="code">[500]</p>
   </body>
 </html>