mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	Rework notification system
This commit is contained in:
		@@ -26,13 +26,12 @@ def add_corpus():
 | 
			
		||||
        try:
 | 
			
		||||
            os.makedirs(dir)
 | 
			
		||||
        except OSError:
 | 
			
		||||
            flash('[ERROR]: Could not add corpus!')
 | 
			
		||||
            flash('[ERROR]: Could not add corpus!', 'corpus')
 | 
			
		||||
            corpus.delete()
 | 
			
		||||
        else:
 | 
			
		||||
            corpus_url = url_for('corpora.corpus', corpus_id=corpus.id)
 | 
			
		||||
            flash('<i class="left material-icons">book</i>'
 | 
			
		||||
                  '[<a href="{}">{}</a>] added'.format(corpus_url,
 | 
			
		||||
                                                       corpus.title))
 | 
			
		||||
            url = url_for('corpora.corpus', corpus_id=corpus.id)
 | 
			
		||||
            flash('[<a href="{}">{}</a>] added'.format(url, corpus.title),
 | 
			
		||||
                  'corpus')
 | 
			
		||||
            return redirect(url_for('corpora.corpus', corpus_id=corpus.id))
 | 
			
		||||
    return render_template('corpora/add_corpus.html.j2',
 | 
			
		||||
                           add_corpus_form=add_corpus_form,
 | 
			
		||||
@@ -82,7 +81,7 @@ def delete_corpus(corpus_id):
 | 
			
		||||
    if not (corpus.creator == current_user or current_user.is_administrator()):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    tasks.delete_corpus(corpus_id)
 | 
			
		||||
    flash('Corpus deleted!')
 | 
			
		||||
    flash('Corpus deleted!', 'corpus')
 | 
			
		||||
    return redirect(url_for('main.dashboard'))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -121,7 +120,7 @@ def add_corpus_file(corpus_id):
 | 
			
		||||
        db.session.add(corpus_file)
 | 
			
		||||
        corpus.status = 'unprepared'
 | 
			
		||||
        db.session.commit()
 | 
			
		||||
        flash('Corpus file added!')
 | 
			
		||||
        flash('Corpus file added!', 'corpus')
 | 
			
		||||
        return make_response(
 | 
			
		||||
            {'redirect_url': url_for('corpora.corpus', corpus_id=corpus.id)},
 | 
			
		||||
            201)
 | 
			
		||||
@@ -141,7 +140,7 @@ def delete_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
            or current_user.is_administrator()):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    tasks.delete_corpus_file(corpus_file_id)
 | 
			
		||||
    flash('Corpus file deleted!')
 | 
			
		||||
    flash('Corpus file deleted!', 'corpus')
 | 
			
		||||
    return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -188,7 +187,7 @@ def edit_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
        corpus_file.title = edit_corpus_file_form.title.data
 | 
			
		||||
        corpus.status = 'unprepared'
 | 
			
		||||
        db.session.commit()
 | 
			
		||||
        flash('Corpus file edited!')
 | 
			
		||||
        flash('Corpus file edited!', 'corpus')
 | 
			
		||||
        return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
 | 
			
		||||
    # If no form is submitted or valid, fill out fields with current values
 | 
			
		||||
    edit_corpus_file_form.address.data = corpus_file.address
 | 
			
		||||
@@ -217,7 +216,7 @@ def prepare_corpus(corpus_id):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    if corpus.files.all():
 | 
			
		||||
        tasks.build_corpus(corpus_id)
 | 
			
		||||
        flash('Corpus gets build now.')
 | 
			
		||||
        flash('Corpus gets build now.', 'corpus')
 | 
			
		||||
    else:
 | 
			
		||||
        flash('Can not build corpus, please add corpus file(s).')
 | 
			
		||||
        flash('Can not build corpus, please add corpus file(s).', 'corpus')
 | 
			
		||||
    return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user