diff options
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/purchase_windows/show.html.slim | 1 |
2 files changed, 1 insertions, 2 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 diff --git a/app/views/purchase_windows/show.html.slim b/app/views/purchase_windows/show.html.slim index 4e836f424..8ed9e393f 100644 --- a/app/views/purchase_windows/show.html.slim +++ b/app/views/purchase_windows/show.html.slim @@ -7,6 +7,5 @@ .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), { Chouette::PurchaseWindow.human_attribute_name(:name) => @purchase_window.try(:name), - 'Organisation' => @purchase_window.referential.organisation.name, Chouette::PurchaseWindow.human_attribute_name(:date_ranges) => @purchase_window.periods.map{|d| t('validity_range', debut: l(d.begin, format: :short), end: l(d.end, format: :short))}.join('<br>').html_safe, Chouette::PurchaseWindow.human_attribute_name(:checksum) => @purchase_window.checksum } |