Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
Patrick Jentsch 2020-03-02 11:42:04 +01:00
commit b5e8ab376e
2 changed files with 13 additions and 3 deletions

View File

@ -11,7 +11,7 @@ class AddCorpusFileForm(FlaskForm):
chapter = StringField('Chapter', validators=[Length(0, 255)]) chapter = StringField('Chapter', validators=[Length(0, 255)])
editor = StringField('Editor', validators=[Length(0, 255)]) editor = StringField('Editor', validators=[Length(0, 255)])
file = FileField('File', validators=[DataRequired()]) file = FileField('File', validators=[DataRequired()])
institution = StringField('institution', validators=[Length(0, 255)]) institution = StringField('Institution', validators=[Length(0, 255)])
journal = StringField('Journal', validators=[Length(0, 255)]) journal = StringField('Journal', validators=[Length(0, 255)])
pages = StringField('Pages', validators=[Length(0, 255)]) pages = StringField('Pages', validators=[Length(0, 255)])
publisher = StringField('Publisher', validators=[Length(0, 255)]) publisher = StringField('Publisher', validators=[Length(0, 255)])

View File

@ -177,6 +177,7 @@
for (let operation of patch) { for (let operation of patch) {
/* "/jobId/valueName" -> ["jobId", "valueName"] */ /* "/jobId/valueName" -> ["jobId", "valueName"] */
console.log(operation.value);
pathArray = operation.path.split("/").slice(1); pathArray = operation.path.split("/").slice(1);
if (pathArray[0] != this.jobId) {continue;} if (pathArray[0] != this.jobId) {continue;}
switch(operation.op) { switch(operation.op) {
@ -215,9 +216,18 @@
setResults(results) { setResults(results) {
let resultsElement; let resultsElement;
results.sort(function (a, b) {
var filenameA = a.filename.toUpperCase();
var filenameB = b.filename.toUpperCase();
if (filenameA < filenameB) {
return -1;
}
if (filenameA > filenameB) {
return 1;
}
return 0;
});
resultsElement = document.getElementById("results"); resultsElement = document.getElementById("results");
for (let result of results) { for (let result of results) {
resultsElement.insertAdjacentHTML( resultsElement.insertAdjacentHTML(
"beforeend", "beforeend",