diff options
| author | Zog | 2018-03-09 17:25:38 +0100 |
|---|---|---|
| committer | Zog | 2018-03-12 12:00:15 +0100 |
| commit | 3a738f4509a67d5024fb85bb551c7ec285cd031e (patch) | |
| tree | 3fd3f0cbfb133e07c66cd3795e81cdd74c648397 /app | |
| parent | 0cd50ea684248e13391ef4f5ee5af5550ff6491f (diff) | |
| download | chouette-core-3a738f4509a67d5024fb85bb551c7ec285cd031e.tar.bz2 | |
Refs #6133; Fix specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/exports_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/iev_interfaces/task.rb | 5 | ||||
| -rw-r--r-- | app/views/shared/iev_interfaces/_messages.html.slim | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb index 36d752347..a5282a514 100644 --- a/app/controllers/exports_controller.rb +++ b/app/controllers/exports_controller.rb @@ -32,7 +32,7 @@ class ExportsController < ChouetteController def export_params permitted_keys = %i(name type referential_id) - export_class = params[:export] && params[:export][:type].safe_constantize + export_class = params[:export] && params[:export][:type] && params[:export][:type].safe_constantize if export_class permitted_keys += export_class.options.keys end diff --git a/app/models/concerns/iev_interfaces/task.rb b/app/models/concerns/iev_interfaces/task.rb index dbdcef8ee..fdd976f39 100644 --- a/app/models/concerns/iev_interfaces/task.rb +++ b/app/models/concerns/iev_interfaces/task.rb @@ -55,8 +55,9 @@ module IevInterfaces::Task return unless parent.present? return unless status_changed? parent.child_change - self.notified_parent_at = DateTime.now - self.class.where(id: self.id).update_all notified_parent_at: DateTime.now + t = Time.now + self.notified_parent_at = t + self.class.where(id: self.id).update_all notified_parent_at: t end def children_succeedeed diff --git a/app/views/shared/iev_interfaces/_messages.html.slim b/app/views/shared/iev_interfaces/_messages.html.slim index eb7a47bc1..82f1add57 100644 --- a/app/views/shared/iev_interfaces/_messages.html.slim +++ b/app/views/shared/iev_interfaces/_messages.html.slim @@ -11,4 +11,4 @@ .col-md-6 - if message.criticity != "info" pre - = JSON.pretty_generate message.resource_attributes + = JSON.pretty_generate message.resource_attributes || {} |