scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-05 19:34:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8712 from scinote-eln/master

Browse source 
Merge master back to develop
This commit is contained in:
Martin Artnik 2025-07-28 11:29:45 +02:00 • committed by GitHub
commit 0d0d68d448
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/serializers/lists/experiment_serializer.rb
View file

@ -102,8 +102,8 @@ module Lists
def due_date_cell def due_date_cell
{ {
value: due_date, value: object.due_date,
value_formatted: due_date, value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date),
editable: can_manage_experiment?(object), editable: can_manage_experiment?(object),
icon: (if object.one_day_prior? && !object.done? icon: (if object.one_day_prior? && !object.done?
'sn-icon sn-icon-alert-warning text-sn-alert-brittlebush' 'sn-icon sn-icon-alert-warning text-sn-alert-brittlebush'
@ -115,8 +115,8 @@ module Lists
def start_date_cell def start_date_cell
{ {
value: start_date, value: object.start_date,
value_formatted: start_date, value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date),
editable: can_manage_experiment?(object) editable: can_manage_experiment?(object)
} }
end end
@ -126,15 +126,5 @@ module Lists
manage: can_manage_experiment?(object) manage: can_manage_experiment?(object)
} }
end 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
end end

4
app/serializers/lists/project_and_folder_serializer.rb
View file

@ -106,7 +106,7 @@ module Lists
def due_date_cell def due_date_cell
if project? 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), value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date),
editable: can_manage_project?(@object), editable: can_manage_project?(@object),
icon: (if object.one_day_prior? && !object.done? icon: (if object.one_day_prior? && !object.done?
@ -121,7 +121,7 @@ module Lists
def start_date_cell def start_date_cell
if project? 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), value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date),
editable: can_manage_project?(@object) editable: can_manage_project?(@object)
} }