mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2024-12-24 10:34:17 +00:00
Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development
This commit is contained in:
commit
b4d2093986
@ -69,7 +69,7 @@ def background_task(app, user_id, session_id, foreign=False):
|
|||||||
' > where '*' is either 'corpora' or 'jobs'
|
' > where '*' is either 'corpora' or 'jobs'
|
||||||
'''
|
'''
|
||||||
with app.app_context():
|
with app.app_context():
|
||||||
user = db.session.query(User).filter_by(id=user_id).first()
|
user = db.session.query(User).get_or_404(user_id)
|
||||||
''' Get current values from the database. '''
|
''' Get current values from the database. '''
|
||||||
corpora = user.corpora_as_dict()
|
corpora = user.corpora_as_dict()
|
||||||
jobs = user.jobs_as_dict()
|
jobs = user.jobs_as_dict()
|
||||||
|
@ -41,8 +41,8 @@
|
|||||||
<div class="col s12 m6">
|
<div class="col s12 m6">
|
||||||
<div id="job-foreign-list">
|
<div id="job-foreign-list">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<span class="card-title">User Jobs</span>
|
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
|
<span class="card-title">User Jobs</span>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col s12">
|
<div class="col s12">
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@ -73,8 +73,8 @@
|
|||||||
<div class="col s12 m6">
|
<div class="col s12 m6">
|
||||||
<div id="corpus-foreign-list">
|
<div id="corpus-foreign-list">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<span class="card-title">User Corpora</span>
|
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
|
<span class="card-title">User Corpora</span>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col s12">
|
<div class="col s12">
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
|
Loading…
Reference in New Issue
Block a user