diff options
| author | Luc Donnet | 2018-02-19 09:50:40 +0100 |
|---|---|---|
| committer | GitHub | 2018-02-19 09:50:40 +0100 |
| commit | 681fdc2fb63a566e9564190b9bc96731d1ba99fb (patch) | |
| tree | 4e772c96e989ed8ee30b7463d1dd96083b96a8e2 | |
| parent | 5f6008d165df4499319a2121a71842657d6ac3c9 (diff) | |
| parent | 6f0c27a582f1b628b46f3c80c56b176263e17b61 (diff) | |
| download | chouette-core-681fdc2fb63a566e9564190b9bc96731d1ba99fb.tar.bz2 | |
Merge pull request #305 from af83/5903-fix-VJS-editor
Fix CustomField loading when no workgroup is available
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |