diff --git a/CHANGELOG.md b/CHANGELOG.md
index d976aef72..73cf5b602 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## Unreleased
+
+### Fixed
+- Typos "success" when returning status from API and "occurred" when logging to console.
+
### Added
- Add "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
-
## 1.18.1 - 2021-08-16
This release fixes a critical issue where invalid zip files could result in the files not being uploaded correctly. To check to see if you are affected, please use the following query:
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 372a6c941..dffa18f38 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -34,6 +34,7 @@ Following is a list of contributors in alphabetical order:
- Sandeep Puthanveetil Satheesan
- Smruti Padhy
- Theerasit Issaranon
+- Tim Yardley
- Todd Nicholson
- Varun Kethineedi
- Ward Poelmans
diff --git a/app/api/Selected.scala b/app/api/Selected.scala
index 3f5b3996e..0ef35436f 100644
--- a/app/api/Selected.scala
+++ b/app/api/Selected.scala
@@ -87,7 +87,7 @@ class Selected @Inject()(selections: SelectionService,
selections.get(user.email.get).map(d => {
selections.remove(d.id, user.email.get)
})
- Ok(toJson(Map("sucess"->"true")))
+ Ok(toJson(Map("success"->"true")))
}
}
}
@@ -100,7 +100,7 @@ class Selected @Inject()(selections: SelectionService,
datasets.removeDataset(d.id, Utils.baseUrl(request), request.apiKey, request.user)
selections.remove(d.id, user.email.get)
})
- Ok(toJson(Map("sucess"->"true")))
+ Ok(toJson(Map("success"->"true")))
}
}
}
@@ -189,7 +189,7 @@ class Selected @Inject()(selections: SelectionService,
events.addObjectEvent(request.user, d.id, d.name, EventType.ADD_TAGS_DATASET.toString)
datasets.index(d.id)
})
- Ok(toJson(Map("sucess"->"true")))
+ Ok(toJson(Map("success"->"true")))
}
}
}
diff --git a/app/api/Sensors.scala b/app/api/Sensors.scala
index 6a5b49eee..e6b5bad90 100644
--- a/app/api/Sensors.scala
+++ b/app/api/Sensors.scala
@@ -5,7 +5,7 @@ import play.api.Play.current
import services.PostgresPlugin
/**
- * Metadata about sensors registered with the system. Datastreams can be associalted with sensors.
+ * Metadata about sensors registered with the system. Datastreams can be associated with sensors.
*/
object Sensors extends Controller with ApiController {
diff --git a/app/assets/javascripts/select-bulk.js b/app/assets/javascripts/select-bulk.js
index b2dd09111..30a4f68f9 100644
--- a/app/assets/javascripts/select-bulk.js
+++ b/app/assets/javascripts/select-bulk.js
@@ -20,7 +20,7 @@ $(function() {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+ textStatus, errorThrown);
+ console.error("The following error occurred: "+ textStatus, errorThrown);
window.location = "../login"; // FIXME hardcoded
});
diff --git a/app/assets/javascripts/select.js b/app/assets/javascripts/select.js
index ba387aad7..137bc2be5 100644
--- a/app/assets/javascripts/select.js
+++ b/app/assets/javascripts/select.js
@@ -19,7 +19,7 @@ $(function() {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+ textStatus, errorThrown);
+ console.error("The following error occurred: "+ textStatus, errorThrown);
window.location = "../login"; // FIXME hardcoded
});
@@ -40,7 +40,7 @@ $(function() {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+ textStatus, errorThrown);
+ console.error("The following error occurred: "+ textStatus, errorThrown);
window.location = "../login"; // FIXME hardcoded
});
diff --git a/app/views/admin/customize.scala.html b/app/views/admin/customize.scala.html
index f1c0c41fa..e8e00cef5 100644
--- a/app/views/admin/customize.scala.html
+++ b/app/views/admin/customize.scala.html
@@ -130,7 +130,7 @@
Customize
});
});
}).fail(function(jqXHR) {
- console.error("The following error occured: " + jqXHR.responseText);
+ console.error("The following error occurred: " + jqXHR.responseText);
notify("The application preferences was not updated", "error");
});
diff --git a/app/views/admin/tos.scala.html b/app/views/admin/tos.scala.html
index f577f4dc9..7b22bb833 100644
--- a/app/views/admin/tos.scala.html
+++ b/app/views/admin/tos.scala.html
@@ -54,7 +54,7 @@
Terms of Service
}).done(function() {
notify("The terms of service have been updated", "success");
}).fail(function(jqXHR) {
- console.error("The following error occured: " + jqXHR.responseText);
+ console.error("The following error occurred: " + jqXHR.responseText);
notify("The terms of service are not updated", "error");
});
diff --git a/app/views/admin/users.scala.html b/app/views/admin/users.scala.html
index dc467b1e3..a5b0ed626 100644
--- a/app/views/admin/users.scala.html
+++ b/app/views/admin/users.scala.html
@@ -212,7 +212,7 @@
users = { active: [], inactive: [], admin: [], unadmin: [] };
notify("Users successfully updated.", "success", false, 5000);
}).fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not update users : " + errorThrown, "error");
});
} else {
diff --git a/app/views/bookmarklet.scala.html b/app/views/bookmarklet.scala.html
index 3a5819985..6efe8ed5f 100644
--- a/app/views/bookmarklet.scala.html
+++ b/app/views/bookmarklet.scala.html
@@ -31,7 +31,7 @@
var outstandingExtractions = new Array();
var tags = {};
var failedCountDown;
- var sucessfullyDone;
+ var successfullyDone;
var countDone;
var status = '';
var imgdocs = {};
@@ -352,7 +352,7 @@
outstandingExtractions = new Array();
tags = {};
failedCountDown = 0;
- sucessfullyDone = 0;
+ successfullyDone = 0;
countDone = 0;
status = '';
imgdocs = {};
@@ -430,7 +430,7 @@
// console.log("Checking submission status");
countDone=0;
failedCountDown=0;
- sucessfullyDone=0;
+ successfullyDone=0;
for ( var j = 0; j < filesInfo.length; j++) {
if (filesInfo[j].status == 'Processing') {
@@ -438,8 +438,8 @@
} else if (filesInfo[j].status == 'Done') {
countDone++;
console.log('---countDone Incremented-- ');
- sucessfullyDone++;
- // jQuery('#DTSSuccessfulExtractions').text(sucessfullyDone);
+ successfullyDone++;
+ // jQuery('#DTSSuccessfulExtractions').text(successfullyDone);
} else if (filesInfo[j].status == 'Required Extractor is either busy or is not currently running. Try after some time.') {
console.log('---[check Results]---status: Required Extractor is either busy or is not currently running. Try after some time.');
}
@@ -457,9 +457,9 @@
}
}
// TODO update ui counts
- jQuery('#DTSSuccessfulExtractions').text(sucessfullyDone);
+ jQuery('#DTSSuccessfulExtractions').text(successfullyDone);
jQuery('#DTSFailedExtractions').text(failedCountDown);
- console.log('Successfull: ' + sucessfullyDone);
+ console.log('Successfull: ' + successfullyDone);
console.log('Failed: ' + failedCountDown);
if (countDone > 0 && countDone == filesInfo.length) {
status = 'Done';
diff --git a/app/views/collectionPreviews.scala.html b/app/views/collectionPreviews.scala.html
index 69fca56a2..ddb792f27 100644
--- a/app/views/collectionPreviews.scala.html
+++ b/app/views/collectionPreviews.scala.html
@@ -62,12 +62,12 @@
Previewers available for this collection
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
});
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
});
diff --git a/app/views/commentform.scala.html b/app/views/commentform.scala.html
index d8355d53f..5622f0613 100644
--- a/app/views/commentform.scala.html
+++ b/app/views/commentform.scala.html
@@ -182,7 +182,7 @@
});
request.fail(function(jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to post a comment.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Error posting comment : " + errorThrown, "error");
diff --git a/app/views/dataset.scala.html b/app/views/dataset.scala.html
index e03ce1819..87e0589a0 100644
--- a/app/views/dataset.scala.html
+++ b/app/views/dataset.scala.html
@@ -450,7 +450,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to create a new dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Error in creating dataset. : " + errorThrown, "error");
diff --git a/app/views/datasets/editInfo.scala.html b/app/views/datasets/editInfo.scala.html
index 0d6837bc3..3df2c0692 100644
--- a/app/views/datasets/editInfo.scala.html
+++ b/app/views/datasets/editInfo.scala.html
@@ -99,7 +99,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to update the information about a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset information was not updated due to : " + errorThrown, "error");
diff --git a/app/views/datasets/filesAndFolders.scala.html b/app/views/datasets/filesAndFolders.scala.html
index 5b64717e1..ff1350de1 100644
--- a/app/views/datasets/filesAndFolders.scala.html
+++ b/app/views/datasets/filesAndFolders.scala.html
@@ -175,7 +175,7 @@
getUpdatedFilesAndFolders();
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not delete marked file "+selected[entry]+": " + errorThrown, "error");
// Add it back to selected list
addFileToMarked(selected[entry]);
@@ -263,7 +263,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a tag from a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The tag was not removed from the dataset due to : " + errorThrown, "error");
@@ -150,7 +150,7 @@
Tags
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to add a tag to a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The tag was not added to the dataset due to : " + errorThrown, "error");
diff --git a/app/views/datasetsContainingFile.scala.html b/app/views/datasetsContainingFile.scala.html
index db553bf71..fb7e548a7 100644
--- a/app/views/datasetsContainingFile.scala.html
+++ b/app/views/datasetsContainingFile.scala.html
@@ -42,7 +42,7 @@
$(event.target.parentNode.parentNode).remove();
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a file from a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not removed from the dataset due to : " + errorThrown, "error");
diff --git a/app/views/emailAdmin.scala.html b/app/views/emailAdmin.scala.html
index a0687adab..d7f158d95 100644
--- a/app/views/emailAdmin.scala.html
+++ b/app/views/emailAdmin.scala.html
@@ -59,7 +59,7 @@
Email admins
$("#subject").val('')
$("#body").val('')
}).fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("The application preferences was not updated due to : " + errorThrown, "error", false);
});
return false;
diff --git a/app/views/errorPage.scala.html b/app/views/errorPage.scala.html
index b65de45d0..53ad47f8d 100644
--- a/app/views/errorPage.scala.html
+++ b/app/views/errorPage.scala.html
@@ -32,7 +32,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a tag from a file.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The tag was not removed from the file due to : " + errorThrown, "error");
@@ -1185,7 +1185,7 @@
Tags
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a tag from a file.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The tag was not removed from the file due to : " + errorThrown, "error");
@@ -1249,7 +1249,7 @@
Tags
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a tag to a file.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The tag was not added to the file due to : " + errorThrown, "error");
diff --git a/app/views/files/share.scala.html b/app/views/files/share.scala.html
index f99678ede..4576d0678 100644
--- a/app/views/files/share.scala.html
+++ b/app/views/files/share.scala.html
@@ -50,7 +50,7 @@
request.fail(function (jqXHR, textStatus, errorThrown){
console.error(
- "The following error occured: "+
+ "The following error occurred: "+
textStatus, errorThrown
);
});
diff --git a/app/views/logoSelect.scala.html b/app/views/logoSelect.scala.html
index 5aafeb113..f5515c9c3 100644
--- a/app/views/logoSelect.scala.html
+++ b/app/views/logoSelect.scala.html
@@ -79,7 +79,7 @@
}).done(function() {
nextFunction();
}).fail(function(jqXHR) {
- console.error("The following error occured: " + jqXHR.responseText);
+ console.error("The following error occurred: " + jqXHR.responseText);
notify("The logo for @path/@name was not updated", "error");
});
}
@@ -101,7 +101,7 @@
}).done(function(response, textStatus, jqXHR) {
nextFunction();
}).fail(function(jqXHR) {
- console.error("The following error occured: " + jqXHR.responseText);
+ console.error("The following error occurred: " + jqXHR.responseText);
notify("The logo for @path/@name was not updated", "error");
});
break;
@@ -125,7 +125,7 @@
}).done(function() {
nextFunction();
}).fail(function(jqXHR) {
- console.error("The following error occured: " + jqXHR.responseText);
+ console.error("The following error occurred: " + jqXHR.responseText);
notify("The logo for @path/@name was not updated", "error");
});
} else {
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index e19f845b0..2e580ab1a 100644
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -340,7 +340,7 @@
updateSelectedCount(response.length);
});
request.fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
if (errorThrown != "Unauthorized") {
notify("Could not get selections: " + errorThrown, "error");
}
@@ -385,7 +385,7 @@
location.reload()
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not delete selections: " + errorThrown, "error");
});
}
@@ -407,7 +407,7 @@
location.reload()
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not clear selections: " + errorThrown, "error");
});
}
@@ -458,7 +458,7 @@
Tag All Selections
notify("Tag(s) successfully added.", "success", false, 2000);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not tag selections: " + errorThrown, "error");
});
diff --git a/app/views/manageMetadataDefinitions.scala.html b/app/views/manageMetadataDefinitions.scala.html
index 7bd957af8..4dbb29827 100644
--- a/app/views/manageMetadataDefinitions.scala.html
+++ b/app/views/manageMetadataDefinitions.scala.html
@@ -190,7 +190,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete metadata definition";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata definition was not removed due to : " + errorThrown, "error");
diff --git a/app/views/metadatald/addMetadata.scala.html b/app/views/metadatald/addMetadata.scala.html
index 9b643ac75..c1d07f9cc 100644
--- a/app/views/metadatald/addMetadata.scala.html
+++ b/app/views/metadatald/addMetadata.scala.html
@@ -216,7 +216,7 @@
Add metadata
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add metadata";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata was not added due to : " + errorThrown, "error");
@@ -499,7 +499,7 @@
Add metadata
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to retrieve metadata definitions";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata was not added due to : " + errorThrown, "error");
diff --git a/app/views/metadatald/newCard.scala.html b/app/views/metadatald/newCard.scala.html
index d9de55923..75af6fb6e 100644
--- a/app/views/metadatald/newCard.scala.html
+++ b/app/views/metadatald/newCard.scala.html
@@ -84,7 +84,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add metadata";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata was not removed due to : " + errorThrown, "error");
@@ -131,7 +131,7 @@
request.fail(function (jqXHR, textStatus, errorThrown){
$("#panel_@m.id > #"+mid).removeClass("popping");
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to retrieve metadata definitions";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata context was not shown due to : " + errorThrown, "error");
diff --git a/app/views/metadatald/newTableRow.scala.html b/app/views/metadatald/newTableRow.scala.html
index cb58b23b3..a903ccf7f 100644
--- a/app/views/metadatald/newTableRow.scala.html
+++ b/app/views/metadatald/newTableRow.scala.html
@@ -69,7 +69,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add metadata";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata was not removed due to : " + errorThrown, "error");
@@ -116,7 +116,7 @@
request.fail(function (jqXHR, textStatus, errorThrown){
$("#"+mid).removeClass("popping");
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to retrieve metadata definitions";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata context was not shown due to : " + errorThrown, "error");
diff --git a/app/views/metadatald/search.scala.html b/app/views/metadatald/search.scala.html
index eaf3e4311..713dd31e4 100644
--- a/app/views/metadatald/search.scala.html
+++ b/app/views/metadatald/search.scala.html
@@ -164,7 +164,7 @@
Search Metadata within Space: "@space.name"
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to retrieve metadata definitions";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Unable to fetch Metadata definitions : " + errorThrown, "error");
@@ -498,7 +498,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add metadata";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata was not removed due to : " + errorThrown, "error");
@@ -270,7 +270,7 @@
Metadata
request.fail(function (jqXHR, textStatus, errorThrown){
$("#"+mid).removeClass("popping");
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to retrieve metadata definitions";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Metadata context was not shown due to : " + errorThrown, "error");
diff --git a/app/views/searchResults.scala.html b/app/views/searchResults.scala.html
index 2cd2d1655..756cee08d 100644
--- a/app/views/searchResults.scala.html
+++ b/app/views/searchResults.scala.html
@@ -200,7 +200,7 @@
alert(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
alert("The metadata of the files (some or all of them) were not dumped due to : " + errorThrown);
});
return false;
@@ -43,7 +43,7 @@
Data dumps
alert(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
alert("The metadata of the datasets (some or all of them) were not dumped due to : " + errorThrown);
});
return false;
@@ -59,7 +59,7 @@
Data dumps
alert(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
alert("The file groupings of the datasets (some or all of them) were not dumped due to : " + errorThrown);
});
return false;
diff --git a/public/datasetsUserMetadataModel/user_metadata_model_allowedNodes.txt~ b/public/datasetsUserMetadataModel/user_metadata_model_allowedNodes.txt~
deleted file mode 100644
index c113d5886..000000000
--- a/public/datasetsUserMetadataModel/user_metadata_model_allowedNodes.txt~
+++ /dev/null
@@ -1,13 +0,0 @@
-Abstract,String,http://purl.org/dc/terms/abstract
-Alternative title,String,http://purl.org/dc/terms/alternative
-Audience,String,http://purl.org/dc/terms/audience
-Bibliographic citation,String,http://purl.org/dc/terms/bibliographicCitation
-Contact,Node,http://dts.ncsa.illinois.edu/terms/contact
-Name,String,http://dts.ncsa.illinois.edu/terms/name
-Email,String,http://dts.ncsa.illinois.edu/terms/email
-Creator,String,http://purl.org/dc/elements/1.1/creator
-Description,String,http://purl.org/dc/elements/1.1/description
-Spatial Reference,Node,http://dts.ncsa.illinois.edu/terms/spatialReference
-Latitude,String,http://dts.ncsa.illinois.edu/terms/latitude
-Longitude,String,http://dts.ncsa.illinois.edu/terms/longitude
-Altitude,String,http://dts.ncsa.illinois.edu/terms/altitude
diff --git a/public/javascripts/DTSbookmarklet/jquery-1.7.2.js b/public/javascripts/DTSbookmarklet/jquery-1.7.2.js
index 3774ff986..75ce26177 100644
--- a/public/javascripts/DTSbookmarklet/jquery-1.7.2.js
+++ b/public/javascripts/DTSbookmarklet/jquery-1.7.2.js
@@ -8249,7 +8249,7 @@ if ( jQuery.support.ajax ) {
xml;
// Firefox throws exceptions when accessing properties
- // of an xhr when a network error occured
+ // of an xhr when a network error occurred
// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
try {
diff --git a/public/javascripts/adminIndex.js b/public/javascripts/adminIndex.js
index d92be7a9e..d4c1ec783 100644
--- a/public/javascripts/adminIndex.js
+++ b/public/javascripts/adminIndex.js
@@ -61,7 +61,7 @@ function getAllAdapters() {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -79,7 +79,7 @@ function getAllExtractors() {
}
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -95,7 +95,7 @@ function getAllMeasures() {
}
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -114,7 +114,7 @@ function getIndexers() {
$("#indexerDropDown").html(''+availableIndexers);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -135,7 +135,7 @@ function getIndexes() {
$("#indexDel").html(''+availableIndexes);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -378,7 +378,7 @@ var createBtn=document.getElementById('create');
$('#createIndexFeedback').text( data);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
$('#createIndexFeedback').text( "Index could not be created");
});
}
@@ -397,7 +397,7 @@ var buildBtn=document.getElementById('build');
$('#buildmsg').text(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
$('#buildmsg').text( "Could not build index");
});
}
@@ -438,7 +438,7 @@ var listBtn=document.getElementById('list');
}
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
});
}
@@ -458,7 +458,7 @@ var listBtn=document.getElementById('list');
$('#deletemsg').text(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
$('#deletemsg').text( "Could not delete index");
});
}
@@ -480,7 +480,7 @@ var listBtn=document.getElementById('list');
$('#deleteallmsg').text(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
$('#deleteallmsg').text( "Could not delete all indexes");
});
}
@@ -499,7 +499,7 @@ reindex.onclick=function(evt){
$('#reindexmsg').text(response.status);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
$('#reindexmsg').text( "Could not reindex");
});
}
diff --git a/public/javascripts/collectionChildCollectionsList.js b/public/javascripts/collectionChildCollectionsList.js
index 9c4f233b6..1c88adf82 100644
--- a/public/javascripts/collectionChildCollectionsList.js
+++ b/public/javascripts/collectionChildCollectionsList.js
@@ -39,7 +39,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to add a child collection to a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not added to the collection due to : " + errorThrown, "error");
@@ -60,7 +60,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a child collection from a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The child collection was not removed from the collection due to : " + errorThrown, "error");
diff --git a/public/javascripts/collectionDatasetsList.js b/public/javascripts/collectionDatasetsList.js
index 267674387..ce02925ed 100644
--- a/public/javascripts/collectionDatasetsList.js
+++ b/public/javascripts/collectionDatasetsList.js
@@ -37,7 +37,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to add a dataset to a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not added to the collection due to : " + errorThrown, "error");
@@ -58,7 +58,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset from a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed from the collection due to : " + errorThrown, "error");
diff --git a/public/javascripts/collectionListProcess.js b/public/javascripts/collectionListProcess.js
index fe7b26702..191ead481 100644
--- a/public/javascripts/collectionListProcess.js
+++ b/public/javascripts/collectionListProcess.js
@@ -24,7 +24,7 @@ function removeCollection(id, isreload, newurl, resourceFromType){
}
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not removed due to : " + errorThrown, "error");
@@ -46,7 +46,7 @@ function removeCollectionAndRedirect(collectionId, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a collection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not deleted from the system due to : " + errorThrown, "error");
@@ -68,7 +68,7 @@ function removeChildCollectionFromParent(parentId, childId, url) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a subcollection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The child collection was not removed from the system due to : " + errorThrown, "error");
@@ -86,7 +86,7 @@ function restoreCollection(id,isreload,newurl){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not restored due to : " + errorThrown, "error");
diff --git a/public/javascripts/collectionModify.js b/public/javascripts/collectionModify.js
index 43f541d06..a50244ff1 100644
--- a/public/javascripts/collectionModify.js
+++ b/public/javascripts/collectionModify.js
@@ -42,7 +42,7 @@ function addCollectionToParentCollection(id) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a collection to a space.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not added to the space due to the following : " + errorThrown, "error");
@@ -86,7 +86,7 @@ function addDatasetToCollection(id) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a dataset to a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not added to the collection due to the following : " + errorThrown, "error");
diff --git a/public/javascripts/comment-delete.js b/public/javascripts/comment-delete.js
index 18e48fe16..d6f362e7b 100644
--- a/public/javascripts/comment-delete.js
+++ b/public/javascripts/comment-delete.js
@@ -21,7 +21,7 @@ function deleteComment(commentId, reloadPage){
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a comment.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The comment was not deleted due to : " + errorThrown, "error");
diff --git a/public/javascripts/comment-edit.js b/public/javascripts/comment-edit.js
index 31457eca7..1cfef5c64 100644
--- a/public/javascripts/comment-edit.js
+++ b/public/javascripts/comment-edit.js
@@ -35,7 +35,7 @@ function editComment(commentId, commentText, senderName, senderEmail, commentLin
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to edit a comment.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The comment was not edited due to : " + errorThrown, "error");
diff --git a/public/javascripts/curationProcess.js b/public/javascripts/curationProcess.js
index 5b72a8e24..2797604b1 100644
--- a/public/javascripts/curationProcess.js
+++ b/public/javascripts/curationProcess.js
@@ -16,7 +16,7 @@ function removeCuration(id, isreload, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a publication request from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The publication request was not deleted from the system due to : " + errorThrown, "error");
@@ -56,7 +56,7 @@ function removeCurationFile(id, currentFolder, curationid){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a file from the publication request";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("File was not removed from the request due to : " + jqXHR.textResponse, "error");
@@ -75,7 +75,7 @@ function removeCurationFolder(id, parentCurationObject, parentId){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a folder from the publication request";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Folder was not removed due to : " + errorThrown, "error");
@@ -107,7 +107,7 @@ function getUpdatedFilesAndFolders(curationObject, limit) {
$('#files').html(response);
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to see files and folders.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Error in getting more files and folders. : " + errorThrown, "error");
diff --git a/public/javascripts/dataset-attach-fileuploader.js b/public/javascripts/dataset-attach-fileuploader.js
index ef1fbf4bd..25900ae4f 100644
--- a/public/javascripts/dataset-attach-fileuploader.js
+++ b/public/javascripts/dataset-attach-fileuploader.js
@@ -32,7 +32,7 @@ $(function () {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to add a dataset to a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The fileset message was not generated due to : " + errorThrown, "error");
diff --git a/public/javascripts/datasetListProcess.js b/public/javascripts/datasetListProcess.js
index c87d866b0..8058307c1 100644
--- a/public/javascripts/datasetListProcess.js
+++ b/public/javascripts/datasetListProcess.js
@@ -19,7 +19,7 @@ function removeDataset(datasetId, isreload, url){
}
});
request.fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed due to : " + errorThrown, "error");
@@ -40,7 +40,7 @@ function restoreDataset(id,isreload,newurl){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not restored due to : " + errorThrown, "error");
@@ -61,7 +61,7 @@ function removeDatasetAndRedirect(datasetId, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a dataset from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not deleted from the system due to : " + errorThrown, "error");
@@ -83,7 +83,7 @@ function detachAndRemoveDatasetAndRedirect(datasetId, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to detach files and then delete a dataset from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not deleted from the system due to : " + errorThrown, "error");
diff --git a/public/javascripts/datasets/collections.js b/public/javascripts/datasets/collections.js
index 1d2df4e17..2fbe48223 100644
--- a/public/javascripts/datasets/collections.js
+++ b/public/javascripts/datasets/collections.js
@@ -37,7 +37,7 @@ function addToCollection(datasetId) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a dataset to a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not added to the collection due to the following : " + errorThrown, "error");
@@ -57,7 +57,7 @@ function removeFromCollection(collectionId, datasetId, event){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset from a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed from the collection due to : " + errorThrown, "error");
@@ -86,7 +86,7 @@ function removeDatasetFromCollectionAndRedirect(collectionId, datasetId, isreloa
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset from a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed from the collection due to : " + errorThrown, "error");
diff --git a/public/javascripts/deleteUtils.js b/public/javascripts/deleteUtils.js
index eb903357b..aed9a2c4c 100644
--- a/public/javascripts/deleteUtils.js
+++ b/public/javascripts/deleteUtils.js
@@ -239,7 +239,7 @@ function clearTrashCollections(url){
window.location.href=url;
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The trash was not removed due to : " + errorThrown, "error");
@@ -255,7 +255,7 @@ function clearTrashDatasets(url){
window.location.href=url;
});
request.fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset trash was not cleared due to : " + errorThrown, "error");
diff --git a/public/javascripts/extractors/extractors.js b/public/javascripts/extractors/extractors.js
index ada1d865c..1ef10a15b 100644
--- a/public/javascripts/extractors/extractors.js
+++ b/public/javascripts/extractors/extractors.js
@@ -20,7 +20,7 @@ function cancelSubmission(id, submit_id, extractor_id, extractType) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
});
}
@@ -136,7 +136,7 @@ function saveExtractorsLabel(label) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var operation = label.id ? "update" : "create";
var specificError = jqXHR.responseText;
var msg = "Failed to " + operation + " label: " + specificError;
@@ -158,7 +158,7 @@ function deleteExtractorsLabel(id) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var specificError = jqXHR.responseText;
var msg = "Failed to delete label: " + specificError
notify(msg, "error");
diff --git a/public/javascripts/file-uploader/jquery.fileupload-clowder-auth.js b/public/javascripts/file-uploader/jquery.fileupload-clowder-auth.js
index 672fd5073..c39a113ad 100644
--- a/public/javascripts/file-uploader/jquery.fileupload-clowder-auth.js
+++ b/public/javascripts/file-uploader/jquery.fileupload-clowder-auth.js
@@ -50,7 +50,7 @@ $(function () {
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("addCallback - fileUploader - The following error occured: " + textStatus, errorThrown);
+ console.error("addCallback - fileUploader - The following error occurred: " + textStatus, errorThrown);
authInProcess = false;
var errMsg = "You must be logged in to upload new files.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
@@ -132,7 +132,7 @@ $(function () {
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("submitCallback - fileUploader - The following error occured: " + textStatus, errorThrown);
+ console.error("submitCallback - fileUploader - The following error occurred: " + textStatus, errorThrown);
authInProcess = false;
var errMsg = "You must be logged in to upload new files.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
diff --git a/public/javascripts/fileListProcess.js b/public/javascripts/fileListProcess.js
index ff3da0aa9..c4cc6a2d3 100644
--- a/public/javascripts/fileListProcess.js
+++ b/public/javascripts/fileListProcess.js
@@ -21,7 +21,7 @@ function removeFile(fileId, isreload, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a file from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not deleted from the system due to : " + errorThrown, "error");
@@ -42,7 +42,7 @@ function removeFileAndRedirect(fileId, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to delete a file from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not deleted from the system due to : " + errorThrown, "error");
diff --git a/public/javascripts/files/datasets.js b/public/javascripts/files/datasets.js
index ad6ac8059..cf3f2642f 100644
--- a/public/javascripts/files/datasets.js
+++ b/public/javascripts/files/datasets.js
@@ -20,7 +20,7 @@ function moveFromDatasetToDataset(folderFromId, datasetFromId, fileId) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to move a file to a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not moved to the dataset due to the following : " + errorThrown, "error");
@@ -52,7 +52,7 @@ function addToDataset(fileId) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a file to a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not added to the dataset due to the following : " + errorThrown, "error");
@@ -71,7 +71,7 @@ function removeFromDataset(datasetId, fileId, event){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a file from a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not removed from the dataset due to : " + errorThrown, "error");
diff --git a/public/javascripts/files/main.js b/public/javascripts/files/main.js
index fd256a918..d7dfcf352 100644
--- a/public/javascripts/files/main.js
+++ b/public/javascripts/files/main.js
@@ -26,7 +26,7 @@ function detachFile(fileId, fileName,event){
$("#fileUserMetadata_"+fileId).remove();
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a file from a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The file was not removed from the dataset due to : " + errorThrown, "error");
diff --git a/public/javascripts/folderListProcess.js b/public/javascripts/folderListProcess.js
index 90155ebb0..5a637c33f 100644
--- a/public/javascripts/folderListProcess.js
+++ b/public/javascripts/folderListProcess.js
@@ -12,7 +12,7 @@ function removeFolder(folderId, parentDataset) {
}
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to remove a folder from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The folder was not removed due to : " + errorThrown, "error");
diff --git a/public/javascripts/manageAdmins.js b/public/javascripts/manageAdmins.js
index 8ed5ac170..f296e6729 100644
--- a/public/javascripts/manageAdmins.js
+++ b/public/javascripts/manageAdmins.js
@@ -19,7 +19,7 @@ function removeAdmin(email){
});
request.fail(function (jqXHR, textStatus, errorThrown){
console.error(
- "The following error occured: "+
+ "The following error occurred: "+
textStatus, errorThrown
);
notify("ERROR: " + errorThrown +". Admin not removed.", error);
diff --git a/public/javascripts/manageRoles.js b/public/javascripts/manageRoles.js
index 50f7819c1..6b6cf8f1f 100644
--- a/public/javascripts/manageRoles.js
+++ b/public/javascripts/manageRoles.js
@@ -15,7 +15,7 @@ function removeRole(roleId, url)
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in and be an administrator to remove a role from the system.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The role was not deleted from the system due to : " + errorThrown, "error");
diff --git a/public/javascripts/metadata/addMetadata.js b/public/javascripts/metadata/addMetadata.js
index 5a856d48f..9ac91a1cb 100644
--- a/public/javascripts/metadata/addMetadata.js
+++ b/public/javascripts/metadata/addMetadata.js
@@ -85,7 +85,7 @@ function loadExternalResource(field_label, field_description, field_id, field_ty
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not retrieve external vocabulary: " + errorThrown, "error");
});
@@ -228,7 +228,7 @@ function loadExternalResource(field_label, field_description, field_id, field_ty
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
notify("Could not retrieve external vocabulary: " + errorThrown, "error");
});
}
diff --git a/public/javascripts/people.js b/public/javascripts/people.js
index 2b8b74c39..9b62f09e2 100644
--- a/public/javascripts/people.js
+++ b/public/javascripts/people.js
@@ -26,7 +26,7 @@
request.fail(function (jqXHR, textStatus, errorThrown){
if(jqXHR.status != 404) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
}
});
}
diff --git a/public/javascripts/previewers/sectionRubberband.js b/public/javascripts/previewers/sectionRubberband.js
index fb5402538..442cd91d1 100644
--- a/public/javascripts/previewers/sectionRubberband.js
+++ b/public/javascripts/previewers/sectionRubberband.js
@@ -350,7 +350,7 @@ function rubberbandAddText(tag, comment, sectionid, prNum) {
request.done(function (response, textStatus, jqXHR) {
});
request.fail(function (jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
window.jsRoutes.api.Sections.delete(sectionid).ajax({
type: "DELETE",
contentType: "application/json"
diff --git a/public/javascripts/previewers/x3dom/some-library.js b/public/javascripts/previewers/x3dom/some-library.js
index 42bf6b71d..38eefc137 100644
--- a/public/javascripts/previewers/x3dom/some-library.js
+++ b/public/javascripts/previewers/x3dom/some-library.js
@@ -169,7 +169,7 @@ function clearConfigTabAnnotations(prNum){
request.fail(function (jqXHR, textStatus, errorThrown){
console.error(
- "The following error occured: "+
+ "The following error occurred: "+
textStatus, errorThrown
);
notify("ERROR: " + errorThrown +". Annotation edit not submitted.", "error");
@@ -301,7 +301,7 @@ function clearConfigTabAnnotations(prNum){
request.fail(function (jqXHR, textStatus, errorThrown){
console.error(
- "The following error occured: "+
+ "The following error occurred: "+
textStatus, errorThrown
);
notify("ERROR: " + errorThrown +". Annotation not submitted.", "error");
diff --git a/public/javascripts/repositories.js b/public/javascripts/repositories.js
index 3fee59c13..751ec6ef0 100644
--- a/public/javascripts/repositories.js
+++ b/public/javascripts/repositories.js
@@ -24,7 +24,7 @@ function expandRepositories() {
request.fail(function(jqXHR, textStatus, errorThrown) {
if (jqXHR.status != 404) {
- console.error("The following error occured: " + textStatus,
+ console.error("The following error occurred: " + textStatus,
errorThrown);
}
});
diff --git a/public/javascripts/searchUserMetadata.js b/public/javascripts/searchUserMetadata.js
index f7884bb15..e8ffde016 100644
--- a/public/javascripts/searchUserMetadata.js
+++ b/public/javascripts/searchUserMetadata.js
@@ -536,7 +536,7 @@ $(function() {
request.fail(function (jqXHR, textStatus, errorThrown){
console.error(
- "The following error occured: "+
+ "The following error occurred: "+
textStatus, errorThrown
);
notify("ERROR: " + errorThrown +". Search not executed.", "error");
diff --git a/public/javascripts/sectionsListProcess.js b/public/javascripts/sectionsListProcess.js
index 522ef77af..96d252367 100644
--- a/public/javascripts/sectionsListProcess.js
+++ b/public/javascripts/sectionsListProcess.js
@@ -19,7 +19,7 @@
$('#sectiondescrEdit_'+id).css("display","inline");
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to submit a section description.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
alert("The section description was not posted due to : " + errorThrown);
diff --git a/public/javascripts/sensors/assign.js b/public/javascripts/sensors/assign.js
index 44208be0c..3b43f3673 100644
--- a/public/javascripts/sensors/assign.js
+++ b/public/javascripts/sensors/assign.js
@@ -11,7 +11,7 @@ function associateWithSensor(resource_type, item_id, dashboard_url) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
});
return false;
@@ -64,7 +64,7 @@ function associateItemWithSensor(resource_type, item_id, sensor_id, sensor_name,
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
});
return false;
diff --git a/public/javascripts/sensors/removeRelation.js b/public/javascripts/sensors/removeRelation.js
index d282d8427..1b1fc0b28 100644
--- a/public/javascripts/sensors/removeRelation.js
+++ b/public/javascripts/sensors/removeRelation.js
@@ -12,7 +12,7 @@ function removeRelation(relation_id) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
if (errorThrown == 'Unauthorized') {
window.alert("You are not authorized to remove the relationship.");
}
diff --git a/public/javascripts/spaceModify.js b/public/javascripts/spaceModify.js
index 36c02a91f..3cead258a 100644
--- a/public/javascripts/spaceModify.js
+++ b/public/javascripts/spaceModify.js
@@ -44,7 +44,7 @@ function addCollectionToSpace(id,spaceTitle) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a collection";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not added due to the following : " + errorThrown, "error");
@@ -68,7 +68,7 @@ function removeCollectionFromSpace(spaceId, id, event){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not removed due to : " + errorThrown, "error");
@@ -101,7 +101,7 @@ function removeCollectionFromSpaceAndRedirect(spaceId, collectionId, isreload, u
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a collection.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The collection was not removed due to : " + errorThrown, "error");
@@ -149,7 +149,7 @@ function addDatasetToSpace(id, spaceTitle) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to add a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not added due to the following : " + errorThrown, "error");
@@ -191,7 +191,7 @@ function removeDatasetFromSpace(spaceId, datasetId, event){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed due to : " + errorThrown, "error");
@@ -229,7 +229,7 @@ function removeDatasetFromSpaceAndRedirect(spaceId, datasetId, isreload, url){
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to remove a dataset.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The dataset was not removed due to : " + errorThrown, "error");
@@ -309,7 +309,7 @@ function acceptSpaceRequest(spaceId, userId, userName){
console.log("Successful accept request");
});
request.fail(function(jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to accept request.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Accept request failed due to : " + errorThrown, "error");
@@ -330,7 +330,7 @@ function rejectSpaceRequest(id, user){
console.log("Successful reject request");
});
request.fail(function(jqXHR, textStatus, errorThrown) {
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to reject request.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("Reject request failed due to : " + errorThrown, "error");
diff --git a/public/javascripts/spaceconfiguration.js b/public/javascripts/spaceconfiguration.js
index 621b383e8..05a76250e 100644
--- a/public/javascripts/spaceconfiguration.js
+++ b/public/javascripts/spaceconfiguration.js
@@ -58,7 +58,7 @@ function updateSpaceConfig(spaceId) {
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+textStatus, errorThrown);
+ console.error("The following error occurred: "+textStatus, errorThrown);
var errMsg = "You must be logged in to update the information about a space.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
alert("The space information was not updated due to : " + errorThrown);
diff --git a/public/javascripts/updateLicenseInfo.js b/public/javascripts/updateLicenseInfo.js
index b32bfeea8..be2131031 100644
--- a/public/javascripts/updateLicenseInfo.js
+++ b/public/javascripts/updateLicenseInfo.js
@@ -185,7 +185,7 @@ function updateData(id, imageBase, sourceObject, authorName) {
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: " + textStatus, errorThrown);
+ console.error("The following error occurred: " + textStatus, errorThrown);
var errMsg = "You must be logged in to edit license information.";
if (!checkErrorAndRedirect(jqXHR, errMsg)) {
notify("The license information was not modified due to : " + errorThrown, "error");
diff --git a/public/javascripts/userMetadata.js b/public/javascripts/userMetadata.js
index d3b17e9ee..d0a526f8e 100644
--- a/public/javascripts/userMetadata.js
+++ b/public/javascripts/userMetadata.js
@@ -189,7 +189,7 @@
});
request.fail(function (jqXHR, textStatus, errorThrown){
- console.error("The following error occured: "+ textStatus, errorThrown);
+ console.error("The following error occurred: "+ textStatus, errorThrown);
notify("Encountered error " + errorThrown + ". Metadata not added.", true)
});