scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 10:14:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge issues for step [SCI-6949]

Browse source
This commit is contained in:
Anton 2022-07-14 12:50:06 +02:00
parent c5c6f73d32
commit 32fac2f9ab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,13 +25,18 @@
<span class="fas fa-caret-right"></span> <span class="fas fa-caret-right"></span>
</a> </a>
<div v-if="!inRepository" class="step-complete-container"> <div v-if="!inRepository" class="step-complete-container">
<div :class="`step-state ${step.attributes.completed ? 'completed' : ''}`" @click="changeState"></div> <div :class="`step-state ${step.attributes.completed ? 'completed' : ''}`"
@click="changeState"
@keyup.enter="changeState"
tabindex="0"
:title="step.attributes.completed ? i18n.t('protocols.steps.status.uncomplete') : i18n.t('protocols.steps.status.complete')"
></div>
</div> </div>
<div class="step-position"> <div class="step-position">
{{ step.attributes.position + 1 }}. {{ step.attributes.position + 1 }}.
</div> </div>
</div> </div>
<div class="step-name-container"> <div class="step-name-container" :class="{'strikethrough': step.attributes.completed}">
<InlineEdit <InlineEdit
v-if="urls.update_url" v-if="urls.update_url"
:value="step.attributes.name" :value="step.attributes.name"
@ -41,6 +46,7 @@
:autofocus="editingName" :autofocus="editingName"
@editingEnabled="editingName = true" @editingEnabled="editingName = true"
@editingDisabled="editingName = false" @editingDisabled="editingName = false"
:editOnload="step.newStep == true"
@update="updateName" @update="updateName"
/> />
<span v-else> <span v-else>