Commit graph

12142 commits

Author SHA1 Message Date
Martin Artnik a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
Martin Artnik 219814ec06 Change protocol clone to support bulk in future [SCI-7990] 2023-02-28 13:11:49 +01:00
Martin Artnik bba9570228 Fix protocol duplication in table [SCI-7990] 2023-02-28 11:36:27 +01:00
aignatov-bio 3735ba51b8
Fix protocol id on protocol show page [SCI-8005] (#5033) 2023-02-27 17:18:12 +01:00
aignatov-bio bda3661a9b
Fix duplicate keywords in protocol table [SCI-8009] (#5034) 2023-02-27 17:17:12 +01:00
artoscinote e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978
Protocol permission modal changes [SCI-7978]
2023-02-27 13:34:32 +01:00
ajugo 0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
G-Chubinidze 33bb7294f1
Merge pull request #5028 from G-Chubinidze/gc_SCI_7997
Show delete button only for drafts [SCI-7997]
2023-02-27 16:16:27 +04:00
Giga Chubinidze 59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04:00
aignatov-bio 68ba45728e
Merge pull request #5031 from aignatov-bio/ai-sci-8004-propagate-archived-flag-to-all-versions
Propagate archived/flag to versions [SCI-8004]
2023-02-27 12:52:11 +01:00
ajugo d26edb08df
Fix access filter and published by column [SCI-7988] (#5030) 2023-02-27 12:08:45 +01:00
Anton 9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01:00
Alex Kriuchykhin 5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] (#5017) 2023-02-27 10:37:51 +01:00
Martin Artnik 3686844dac Add missing protocol default user role view [SCI-7978] 2023-02-24 18:28:19 +01:00
ajugo 95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
aignatov-bio ced0da6dbc
Merge pull request #5026 from aignatov-bio/ai-sci-7989-fix-version-number-for-draft
Fix version number for draft [SCI-7989]
2023-02-24 17:52:37 +01:00
Martin Artnik 7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Martin Artnik 89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +01:00
aignatov-bio 5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton 60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
aignatov-bio aa6e9bf1bf
Merge pull request #5023 from aignatov-bio/ai-sci-8003-update-protocol-name-validation
Fix protocol name validation [SCI-8003]
2023-02-24 10:23:07 +01:00
Anton dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
Martin Artnik a43f70f8ba Set default public user role for visible projects [SCI-7978] 2023-02-23 15:28:46 +01:00
aignatov-bio 8906bc25e7
Fix version counting in protocol datatable [SCI-7993] (#5019) 2023-02-23 15:13:57 +01:00
Martin Artnik c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
aignatov-bio fb63c49be5
Merge pull request #5015 from aignatov-bio/ai-sci-7907-add-save-as-draft-action
Add save as draft action [SCI-7907]
2023-02-22 18:51:19 +01:00
Martin Artnik b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +01:00
Anton 826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
aignatov-bio 5d3e6b7226
Merge pull request #5007 from aignatov-bio/ai-sci-7717-protocol-new-activities
Add new protocol activities [SCI-7717]
2023-02-22 10:48:20 +01:00
Anton f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +01:00
ajugo 0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918)
Implement filters for protocol template datatable [SCI-7605]
2023-02-21 14:57:43 +01:00
aignatov-bio 8f25b9c1cb
Merge pull request #4995 from aignatov-bio/ai-sci-7810-add-create-protocol-modal
Add new protocol modal [SCI-7810][SCI-7895]
2023-02-21 14:17:18 +01:00
Anton a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
aignatov-bio ae607839c1
Merge pull request #5002 from aignatov-bio/ai-sci-7715-update-protocol-io-front-end
Update protocolsIo front-end [SCI-7715]
2023-02-21 14:06:42 +01:00
ajugo 166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
Anton c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
ajugo 2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
ajugo 9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
aignatov-bio 90f9c051d3
Merge pull request #4978 from aignatov-bio/ai-sci-7901-add-export-action-to-protocol-repository
Update export action in protocol repository [SCI-7901]
2023-02-16 17:59:31 +01:00
Anton a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
ajugo cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870)
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +01:00
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
artoscinote 03631d28aa
Merge pull request #4968 from scinote-eln/ma_SCI_7916
Fix webpack if no addons are present [SCI-7916]
2023-02-14 10:59:31 +01:00
Martin Artnik 8f6d1f7872 Fix webpack if no addons are present [SCI-7916] 2023-02-14 10:43:55 +01:00
artoscinote 5eb7fa8363
Merge pull request #4962 from sboursen-scinote/sb_SCI-7685
Update pdf/docx reports - font size [SCI-7685]
2023-02-14 10:27:34 +01:00
artoscinote d3a1da6244
Merge pull request #4965 from artoscinote/ma_SCI_7916
Add image TinyMCE plugin [SCI-7916]
2023-02-14 10:26:31 +01:00
artoscinote ed1de9836b
Merge pull request #4966 from artoscinote/ma_SCI_7918
Fix base64 image extraction for non-saved models [SCI-7918]
2023-02-14 10:01:29 +01:00
Alex Kriuchykhin b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
aignatov-bio 724fe3ebd4
Merge pull request #4964 from aignatov-bio/ai-sci-7905-public-action-for-protocol
Add publish and delete action [SCI-7905]
2023-02-13 16:10:42 +01:00
Martin Artnik 8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00