diff --git a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb index b1a62200f..365fc8dd2 100644 --- a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb @@ -28,10 +28,6 @@ <%= t('protocols.protocols_io_import.preview.guideln') %> <%= sanitize_input(json_object['guidelines'].html_safe) %>
<% end %> - <% if json_object['link'].present? %> - <%= t('protocols.protocols_io_import.preview.p_link') %> - <%= sanitize_input(json_object['link'].html_safe) %>
- <% end %> <% if json_object['manuscript_citation'].present? %> <%= t('protocols.protocols_io_import.preview.manu_cit') %> <%= sanitize_input(json_object['manuscript_citation'].html_safe) %>
@@ -58,6 +54,10 @@ <%= sanitize_input(tag['tag_name'])+' , ' %>
<% end %> <% end %> + <% if json_object['link'].present? %> + <%= t('protocols.protocols_io_import.preview.p_link') %> + <%= sanitize_input(json_object['link'].html_safe) %>
+ <% end %> diff --git a/app/views/protocols/protocolsio_import_create.js.erb b/app/views/protocols/protocolsio_import_create.js.erb index ba20d05c3..b9dbd0cd5 100644 --- a/app/views/protocols/protocolsio_import_create.js.erb +++ b/app/views/protocols/protocolsio_import_create.js.erb @@ -1,7 +1,8 @@ <% if @protocolsio_too_big %> -alert('<%= I18n.t('my_modules.protocols.load_from_file_size_error', - size: Constants::FILE_MAX_SIZE_MB ) %>'); +$('#modal-import-json-protocol').modal('hide'); +HelperModule.flashAlertMsg(' <%= t('my_modules.protocols.load_from_file_size_error', + size: Constants::FILE_MAX_SIZE_MB ) %>','danger'); <% else %> $('#modal-import-json-protocol').modal('hide'); <% if remotipart_submitted? %> <%# a workaround to a bug with remotipart, that caused alot of headache, courtesy of github.com/dhampik %> diff --git a/app/views/protocols/protocolsio_import_save.js.erb b/app/views/protocols/protocolsio_import_save.js.erb index 16ad30454..1250b7816 100644 --- a/app/views/protocols/protocolsio_import_save.js.erb +++ b/app/views/protocols/protocolsio_import_save.js.erb @@ -1,8 +1,10 @@ <% if @protocolsio_general_error %> - alert('<%= I18n.t('my_modules.protocols.load_from_file_protocol_general_error', +$('#modal-import-json-protocol-preview').modal('hide'); + alert(' <%= t('my_modules.protocols.load_from_file_protocol_general_error', max: Constants::NAME_MAX_LENGTH, min: Constants::NAME_MIN_LENGTH) %>'); <% else %> $('#modal-import-json-protocol-preview').modal('hide'); $('#protocols_io_form').trigger("reset"); protocolsDatatable.ajax.reload(); + HelperModule.flashAlertMsg(' <%= t('protocols.index.import_results.message_ok_pio')%>', 'success'); <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index d77f7546c..3331e45cd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1385,7 +1385,7 @@ en: b_s_p: "Before starting protocol information:" warn: "Protocol warning:" guideln: "Guidelines:" - p_link: "Supplied link:" + p_link: "Link:" s_nobr_link: "Link:" s_link: "Link:" s_desc: "Description:" @@ -1555,6 +1555,7 @@ en: title: "Import results" message_failed: "Failed to import %{nr} protocol/s." message_ok: "Successfully imported %{nr} protocol/s." + message_ok_pio: "Successfully imported protocol from protocols.io file." row_success: "Imported" row_renamed: "Imported & renamed" row_failed: "Failed"