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

fixes inport eln error message and spinner [fixes SCI-752]

Browse source
This commit is contained in:
zmagod 2016-12-05 10:44:58 +01:00
parent 7309da9d92
commit ef2471d3f7
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -494,7 +494,12 @@ function initImport() {
// Simply reload page // Simply reload page
location.reload(); location.reload();
} else { } else {
alert(I18n.t("my_modules.protocols.load_from_file_error")); if (data.status === 'size_too_large') {
alert(I18n.t("my_modules.protocols.load_from_file_size_error"));
} else {
alert(I18n.t("my_modules.protocols.load_from_file_error"));
}
animateSpinner(null, false);
} }
}); });

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

@ -657,6 +657,7 @@ function initImport() {
} }
); );
modalBody.append(failedMessageEl); modalBody.append(failedMessageEl);
animateSpinner(null, false);
} }
if (nrSuccessful > 0) { if (nrSuccessful > 0) {
var successMessageEl = newElement( var successMessageEl = newElement(

1
config/locales/en.yml
View file

@ -552,6 +552,7 @@ en:
confirm: "Copy to repository" confirm: "Copy to repository"
load_from_file_flash: "Successfully loaded the protocol from the file." load_from_file_flash: "Successfully loaded the protocol from the file."
load_from_file_error: "Failed to load the protocol from file." load_from_file_error: "Failed to load the protocol from file."
load_from_file_size_error: "Failed to load the protocol from file. Limit is 50Mb."
results: results:
head_title: "%{project} | %{module} | Results" head_title: "%{project} | %{module} | Results"
add_label: "Add new result:" add_label: "Add new result:"