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

Merge pull request #4289 from okriuchykhin/ok_SCI_6973_v2

Browse source 
Fix toggling for steps and checklists [SCI-6973]
This commit is contained in:
Alex Kriuchykhin 2022-07-26 13:51:54 +02:00 • committed by GitHub
commit 4012f0d7a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@
<StorageUsage v-if="showStorageUsage()" :step="step"/>
</div>
<div class="step-header">
<div class="step-element-header" :class="{ 'step-element--locked': !urls.update_url }">
<div class="step-element-header" :class="{ 'step-element--locked': !(urls.update_url || urls.state_url) }">
<div class="step-controls">
<div v-if="reorderStepUrl" class="step-element-grip" @click="$emit('reorder')">
<i class="fas fas-rotated-90 fa-exchange-alt"></i>
@ -39,6 +39,7 @@
<div class="step-name-container" :class="{'strikethrough': step.attributes.completed}">
<InlineEdit
:value="step.attributes.name"
:class="{ 'step-element--locked': !urls.update_url }"
:characterLimit="255"
:allowBlank="false"
:attributeName="`${i18n.t('Step')} ${i18n.t('name')}`"

3
app/javascript/vue/protocol/step_elements/checklist.vue
View file

@ -1,5 +1,5 @@
<template>
<div class="step-checklist-container" :class="{ 'step-element--locked': !element.attributes.orderable.urls.update_url }">
<div class="step-checklist-container" >
<div class="step-element-header" :class="{ 'editing-name': editingName }">
<div v-if="reorderElementUrl" class="step-element-grip" @click="$emit('reorder')">
<i class="fas fas-rotated-90 fa-exchange-alt"></i>
@ -7,6 +7,7 @@
<div v-else class="step-element-grip-placeholder"></div>
<div class="step-element-name">
<InlineEdit
:class="{ 'step-element--locked': !element.attributes.orderable.urls.update_url }"
:value="element.attributes.orderable.name"
:sa_value="element.attributes.orderable.sa_name"
:characterLimit="10000"

3
app/javascript/vue/protocol/step_elements/checklistItem.vue
View file

@ -1,5 +1,5 @@
<template>
<div class="step-checklist-item" :class="{ 'step-element--locked': !updateUrl }">
<div class="step-checklist-item" :class="{ 'step-element--locked': !(updateUrl || toggleUrl) }">
<div class="step-element-header" :class="{ 'locked': locked || editingText, 'editing-name': editingText }">
<div v-if="reorderChecklistItemUrl" class="step-element-grip step-element-grip--draggable" :class="{ 'step-element-grip--disabled': !draggable }">
<i class="fas fa-grip-vertical"></i>
@ -18,6 +18,7 @@
<div v-else class="sci-checkbox-view-mode"></div>
<div class="step-checklist-text">
<InlineEdit
:class="{ 'step-element--locked': !updateUrl }"
:value="checklistItem.attributes.text"
:sa_value="checklistItem.attributes.sa_text"
:characterLimit="10000"