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

This commit is contained in:
Patrick Jentsch 2020-01-13 15:33:11 +01:00
commit 8c69c3881f
2 changed files with 25 additions and 4 deletions

View File

@ -33,8 +33,20 @@ class AddCorpusForm(FlaskForm):
title = StringField('Title', validators=[DataRequired(), Length(1, 32)]) title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
class EditCorpusFileForm(AddCorpusFileForm): class EditCorpusFileForm(FlaskForm):
pass address = StringField('Adress', validators=[Length(0, 255)])
author = StringField('Author', validators=[DataRequired(), Length(1, 255)])
booktitle = StringField('Booktitle', validators=[Length(0, 255)])
chapter = StringField('Chapter', validators=[Length(0, 255)])
editor = StringField('Editor', validators=[Length(0, 255)])
institution = StringField('institution', validators=[Length(0, 255)])
journal = StringField('Journal', validators=[Length(0, 255)])
pages = StringField('Pages', validators=[Length(0, 255)])
publisher = StringField('Publisher', validators=[Length(0, 255)])
publishing_year = IntegerField('Publishing year', validators=[DataRequired()])
school = StringField('School', validators=[Length(0, 255)])
submit = SubmitField()
title = StringField('Title', validators=[DataRequired(), Length(1, 255)])
class QueryForm(FlaskForm): class QueryForm(FlaskForm):

View File

@ -166,8 +166,17 @@ def edit_corpus_file(corpus_id, corpus_file_id):
abort(403) abort(403)
edit_corpus_file_form = EditCorpusFileForm() edit_corpus_file_form = EditCorpusFileForm()
if edit_corpus_file_form.validate_on_submit(): if edit_corpus_file_form.validate_on_submit():
corpus_file.author = edit_corpus_file_form.author.data ids = [field.id for field in edit_corpus_file_form if not
corpus_file.publishing_year = edit_corpus_file_form.publishing_year.data (field.id == 'submit'
or field.id == "csrf_token"
or field.id == "file")]
data = [field.data for field in edit_corpus_file_form if not
(field.id == 'submit'
or field.id == "csrf_token"
or field.id == "file")]
field_dict = dict(zip(ids, data))
stmt = db.update(CorpusFile).where(CorpusFile.id==corpus_file_id).values(**field_dict)
db.session.execute(stmt)
db.session.commit() db.session.commit()
thread = Thread(target=edit_corpus_file_, thread = Thread(target=edit_corpus_file_,
args=(current_app._get_current_object(), args=(current_app._get_current_object(),