sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-07-14 00:13:18 +00:00
Code Issues Projects Releases Wiki Activity

Updated URL Logic for admin package

Browse Source
This commit is contained in:
Patrick Jentsch
2019-11-15 11:45:04 +01:00
parent 74324ac0be
commit f22bff4ed0
13 changed files with 402 additions and 414 deletions

24
app/corpora/views.py

@ -3,6 +3,7 @@ from app.models import Corpus, CorpusFile
from flask import (abort, current_app, flash, redirect, request,
render_template, url_for, send_from_directory)
from flask_login import current_user, login_required
from threading import Thread
from werkzeug.utils import secure_filename
from . import corpora
from .background_functions import (delete_corpus_, delete_corpus_file_,
@ -10,7 +11,6 @@ from .background_functions import (delete_corpus_, delete_corpus_file_,
from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm,
QueryDownloadForm, QueryForm)
import os
import threading
@corpora.route('/add', methods=['GET', 'POST'])
@ -71,9 +71,8 @@ def delete_corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if not (corpus.creator == current_user or current_user.is_administrator()):
abort(403)
thread = threading.Thread(target=delete_corpus_,
args=(current_app._get_current_object(),
corpus.id))
thread = Thread(target=delete_corpus_,
args=(current_app._get_current_object(), corpus.id))
thread.start()
flash('Corpus deleted!')
return redirect(url_for('main.dashboard'))
@ -106,9 +105,9 @@ def add_corpus_file(corpus_id):
title=add_corpus_file_form.title.data)
db.session.add(corpus_file)
db.session.commit()
thread = threading.Thread(target=edit_corpus_file_,
args=(current_app._get_current_object(),
corpus_file.id))
thread = Thread(target=edit_corpus_file_,
args=(current_app._get_current_object(),
corpus_file.id))
thread.start()
flash('Corpus file added!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
@ -126,9 +125,8 @@ def delete_corpus_file(corpus_id, corpus_file_id):
if not (corpus_file.corpus.creator == current_user
or current_user.is_administrator()):
abort(403)
thread = threading.Thread(target=delete_corpus_file_,
args=(current_app._get_current_object(),
corpus_file.id))
thread = Thread(target=delete_corpus_file_,
args=(current_app._get_current_object(), corpus_file.id))
thread.start()
flash('Corpus file deleted!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
@ -165,9 +163,9 @@ def edit_corpus_file(corpus_id, corpus_file_id):
corpus_file.publishing_year = edit_corpus_file_form.publishing_year.data
corpus_file.title = edit_corpus_file_form.title.data
db.session.commit()
thread = threading.Thread(target=edit_corpus_file_,
args=(current_app._get_current_object(),
corpus_file.id))
thread = Thread(target=edit_corpus_file_,
args=(current_app._get_current_object(),
corpus_file.id))
thread.start()
flash('Corpus file edited!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))