mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus
This commit is contained in:
		@@ -59,7 +59,6 @@ def create_corpus():
 | 
			
		||||
@bp.route('/<hashid:corpus_id>', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def corpus(corpus_id):
 | 
			
		||||
    print(corpus_id)
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
    if not (corpus.user == current_user
 | 
			
		||||
            or current_user.is_administrator()
 | 
			
		||||
@@ -89,7 +88,6 @@ def corpus(corpus_id):
 | 
			
		||||
    if corpus.user == current_user:
 | 
			
		||||
        return render_template(
 | 
			
		||||
            'corpora/corpus.html.j2',
 | 
			
		||||
            corpus_settings_form=corpus_settings_form,
 | 
			
		||||
            corpus=corpus,
 | 
			
		||||
            token=token,
 | 
			
		||||
            title='Corpus'
 | 
			
		||||
@@ -119,18 +117,26 @@ def share_corpus(token):
 | 
			
		||||
    corpus_id = hashids.decode(corpus_hashid)
 | 
			
		||||
    return redirect(url_for('.corpus', corpus_id=corpus_id))
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
# @bp.route('/<hashid:corpus_id>/update')
 | 
			
		||||
# @login_required
 | 
			
		||||
# def update_corpus(corpus_id):
 | 
			
		||||
#     corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
#     if not (corpus.user == current_user or current_user.is_administrator()):
 | 
			
		||||
#         abort(403)
 | 
			
		||||
#     return render_template(
 | 
			
		||||
#         'corpora/update_corpus.html.j2',
 | 
			
		||||
#         corpus=corpus,
 | 
			
		||||
#         title='Corpus'
 | 
			
		||||
#     )
 | 
			
		||||
@bp.route('/<hashid:corpus_id>/enable_is_public', methods=['POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def enable_corpus_is_public(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
    if not (corpus.user == current_user or current_user.is_administrator()):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    corpus.is_public = True
 | 
			
		||||
    db.session.commit()
 | 
			
		||||
    return '', 204
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@bp.route('/<hashid:corpus_id>/disable_is_public', methods=['POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def disable_corpus_is_public(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
    if not (corpus.user == current_user or current_user.is_administrator()):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    corpus.is_public = False
 | 
			
		||||
    db.session.commit()
 | 
			
		||||
    return '', 204
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@bp.route('/<hashid:corpus_id>', methods=['DELETE'])
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user