Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion API/Backend/Datasets/models/datasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function makeNewDatasetTable(name, columns, success, failure) {
failure({
status: "failure",
message: "Failed to find existing datasets",
error: error,
error: err,
name: name,
});
});
Expand Down
5 changes: 2 additions & 3 deletions API/Backend/Draw/routes/filesutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,12 @@ function getfile(req, res, next) {
(published ? "AND action_index=4 " : "") +
"ORDER BY time DESC" +
" " +
"FETCH first " +
(published ? req.body.id.length : "1") +
" rows only",
"FETCH first :first rows only",
{
replacements: {
id: ids,
time: atThisTime,
first: published ? req.body.id.length : 1,
},
}
)
Expand Down
4 changes: 2 additions & 2 deletions API/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@ const Utils = {
forceAlphaNumUnder: function (str) {
if (typeof str === "string") {
return str
.replace(/[`~!@#$%^&*|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "")
.replace(/[`~!@#$%^&*|+\-=?;:'",.<>\{\}\[\]\\\//() ]/gi, "")
.replace(/[^ -~]+/g, "");
} else if (typeof str === "number") {
return str;
} else if (Array.isArray(str)) {
return str
.join(",")
.replace(/[`~!@#$%^&*|+\-=?;:'".<>\{\}\[\]\\\/]/gi, "")
.replace(/[`~!@#$%^&*|+\-=?;:'".<>\{\}\[\]\\\//() ]/gi, "")
.replace(/[^ -~]+/g, "")
.split(",");
} else {
Expand Down