From 6f0c27a582f1b628b46f3c80c56b176263e17b61 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 12 Feb 2018 16:58:00 +0100
Subject: Refs #5903; Fix CustomField loading when no workgroup is available

---
 app/controllers/vehicle_journeys_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index e031e4952..a389f3ab0 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -154,7 +154,7 @@ class VehicleJourneysController < ChouetteController
 
   private
   def load_custom_fields
-    @custom_fields = current_workgroup.custom_fields_definitions
+    @custom_fields = current_workgroup&.custom_fields_definitions || {}
   end
 
   def map_stop_points points
-- 
cgit v1.2.3