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

Merge pull request #4977 from sboursen-scinote/sb_SCI-7910

Browse source 
Protocol templates - revert action and alert message [SCI-7910]
This commit is contained in:
Soufiane 2023-02-28 15:33:05 +01:00 • committed by GitHub
commit 53f2bc3be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/my_modules/protocols.js
View file

@ -48,6 +48,7 @@ function initLinkUpdate() {
modal.attr('data-url', data.url); modal.attr('data-url', data.url);
modal.modal('show'); modal.modal('show');
}); });
modal.on('hidden.bs.modal', function() { modal.on('hidden.bs.modal', function() {
modalBody.html(''); modalBody.html('');
}); });

8
config/locales/en.yml
View file

@ -1082,9 +1082,9 @@ en:
unlink_title: "Unlink protocol template" unlink_title: "Unlink protocol template"
unlink_message: "Are you sure you want to unlink the task protocol from the templates version? This will stop any tracking of changes." unlink_message: "Are you sure you want to unlink the task protocol from the templates version? This will stop any tracking of changes."
unlink_btn_text: "Unlink" unlink_btn_text: "Unlink"
revert_title: "Revert protocol" revert_title: "Revert protocol template"
revert_message: "Are you sure you want to revert the task protocol to the templates version? This will override any local changes you made." revert_message: "This will override any changes you made. We can’t recover them once you revert.<br /><br /><strong>Are you sure?</strong>"
revert_btn_text: "Revert" revert_btn_text: "Yes, revert it"
update_parent_title: "Update templates version" update_parent_title: "Update templates version"
update_parent_message: "Are you sure you want to update the templates protocol with this version? This will override any other changes made in the templates version." update_parent_message: "Are you sure you want to update the templates protocol with this version? This will override any other changes made in the templates version."
update_self_title: "Update from protocol templates" update_self_title: "Update from protocol templates"
@ -1093,7 +1093,7 @@ en:
warning: "Are you sure?" warning: "Are you sure?"
unlink_flash: "Protocol was successfully unlinked." unlink_flash: "Protocol was successfully unlinked."
unlink_error: "Failed to unlink protocol." unlink_error: "Failed to unlink protocol."
revert_flash: "Protocol was successfully reverted to protocol version." revert_flash: "Protocol was successfully reverted."
revert_error: "Failed to revert protocol." revert_error: "Failed to revert protocol."
revert_error_locked: "Failed to revert protocol. One or more files in the protocol are currently being edited." revert_error_locked: "Failed to revert protocol. One or more files in the protocol are currently being edited."
update_parent_flash: "Protocol in templates was successfully updated with the version from the task." update_parent_flash: "Protocol in templates was successfully updated with the version from the task."