scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 09:13:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix loading task steps and step timestamps [SCI-7902] (#4941)

Browse source
This commit is contained in:
ajugo 2023-02-06 16:47:11 +01:00 committed by GitHub
parent bfb035d339
commit 29a7113cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/vue/protocol/step.vue
View file

@ -128,7 +128,7 @@
</div>
<div class="collapse in" :id="'stepBody' + step.id">
<div class="step-elements">
<div class="step-timestamp">{{ i18n.t('protocols.steps.timestamp', {date: step.attributes.created_on, user: step.attributes.created_by}) }}</div>
<div class="step-timestamp">{{ i18n.t('protocols.steps.timestamp', {date: step.attributes.created_at, user: step.attributes.created_by}) }}</div>
<template v-for="(element, index) in orderedElements">
<component
:is="elements[index].attributes.orderable_type"

2
app/serializers/step_serializer.rb
View file

@ -8,7 +8,7 @@ class StepSerializer < ActiveModel::Serializer
attributes :name, :position, :completed, :attachments_manageble, :urls, :assets_view_mode, :assets_order,
:marvinjs_enabled, :bio_eddie_service_enabled, :bio_eddie_context, :marvinjs_context,
:wopi_enabled, :wopi_context, :comments_count, :unseen_comments, :storage_limit, :created_on,
:wopi_enabled, :wopi_context, :comments_count, :unseen_comments, :storage_limit, :created_at,
:created_by
def bio_eddie_service_enabled