diff --git a/app/serializers/lists/experiment_serializer.rb b/app/serializers/lists/experiment_serializer.rb index 1fd5a52f6..5f68c2f02 100644 --- a/app/serializers/lists/experiment_serializer.rb +++ b/app/serializers/lists/experiment_serializer.rb @@ -102,8 +102,8 @@ module Lists def due_date_cell { - value: due_date, - value_formatted: due_date, + value: object.due_date, + value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date), editable: can_manage_experiment?(object), icon: (if object.one_day_prior? && !object.done? 'sn-icon sn-icon-alert-warning text-sn-alert-brittlebush' @@ -115,8 +115,8 @@ module Lists def start_date_cell { - value: start_date, - value_formatted: start_date, + value: object.start_date, + value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date), editable: can_manage_experiment?(object) } end @@ -126,15 +126,5 @@ module Lists manage: can_manage_experiment?(object) } end - - private - - def due_date - I18n.l(object.due_date, format: :full_date) if object.due_date - end - - def start_date - I18n.l(object.start_date, format: :full_date) if object.start_date - end end end diff --git a/app/serializers/lists/project_and_folder_serializer.rb b/app/serializers/lists/project_and_folder_serializer.rb index 9765601e2..d9b686bb8 100644 --- a/app/serializers/lists/project_and_folder_serializer.rb +++ b/app/serializers/lists/project_and_folder_serializer.rb @@ -106,7 +106,7 @@ module Lists def due_date_cell if project? { - value: (I18n.l(object.due_date, format: :default) if object.due_date), + value: object.due_date, value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date), editable: can_manage_project?(@object), icon: (if object.one_day_prior? && !object.done? @@ -121,7 +121,7 @@ module Lists def start_date_cell if project? { - value: (I18n.l(object.start_date, format: :default) if object.start_date), + value: object.start_date, value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date), editable: can_manage_project?(@object) }