scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Andrej 2023-05-17 11:40:14 +02:00
parent 32d8fc3e0c
commit 6ed55be62c
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/container.vue
View file

@ -77,7 +77,7 @@
:fieldName="'protocol[description]'" :fieldName="'protocol[description]'"
:lastUpdated="protocol.attributes.updated_at" :lastUpdated="protocol.attributes.updated_at"
:assignableMyModuleId="protocol.attributes.assignable_my_module_id" :assignableMyModuleId="protocol.attributes.assignable_my_module_id"
:characterLimit="100000" :characterLimit="1000000"
@update="updateDescription" @update="updateDescription"
/> />
</div> </div>

2
app/javascript/vue/protocol/step_elements/text.vue
View file

@ -27,7 +27,7 @@
:fieldName="'step_text[text]'" :fieldName="'step_text[text]'"
:lastUpdated="element.attributes.orderable.updated_at" :lastUpdated="element.attributes.orderable.updated_at"
:assignableMyModuleId="assignableMyModuleId" :assignableMyModuleId="assignableMyModuleId"
:characterLimit="100000" :characterLimit="1000000"
@update="update" @update="update"
@editingDisabled="disableEditMode" @editingDisabled="disableEditMode"
@editingEnabled="enableEditMode" @editingEnabled="enableEditMode"