sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-14 16:55:42 +00:00
Code Issues Projects Releases Wiki Activity

Add back community update code

Browse Source
This commit is contained in:
Patrick Jentsch 2023-06-06 11:48:58 +02:00
parent c2a6b9d746
commit f4b30433e6
2 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
app/corpora/followers/json_routes.py
View File

@ -12,65 +12,65 @@ from ..decorators import corpus_follower_permission_required
from . import bp from . import bp
# @bp.route('/<hashid:corpus_id>/followers', methods=['POST']) @bp.route('/<hashid:corpus_id>/followers', methods=['POST'])
# @corpus_follower_permission_required('MANAGE_FOLLOWERS') @corpus_follower_permission_required('MANAGE_FOLLOWERS')
# @content_negotiation(consumes='application/json', produces='application/json') @content_negotiation(consumes='application/json', produces='application/json')
# def create_corpus_followers(corpus_id): def create_corpus_followers(corpus_id):
# usernames = request.json usernames = request.json
# if not (isinstance(usernames, list) or all(isinstance(u, str) for u in usernames)): if not (isinstance(usernames, list) or all(isinstance(u, str) for u in usernames)):
# abort(400) abort(400)
# corpus = Corpus.query.get_or_404(corpus_id) corpus = Corpus.query.get_or_404(corpus_id)
# for username in usernames: for username in usernames:
# user = User.query.filter_by(username=username, is_public=True).first_or_404() user = User.query.filter_by(username=username, is_public=True).first_or_404()
# user.follow_corpus(corpus) user.follow_corpus(corpus)
# db.session.commit() db.session.commit()
# response_data = { response_data = {
# 'message': f'Users are now following "{corpus.title}"', 'message': f'Users are now following "{corpus.title}"',
# 'category': 'corpus' 'category': 'corpus'
# } }
# return response_data, 200 return response_data, 200
# @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>/role', methods=['PUT']) @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>/role', methods=['PUT'])
# @corpus_follower_permission_required('MANAGE_FOLLOWERS') @corpus_follower_permission_required('MANAGE_FOLLOWERS')
# @content_negotiation(consumes='application/json', produces='application/json') @content_negotiation(consumes='application/json', produces='application/json')
# def update_corpus_follower_role(corpus_id, follower_id): def update_corpus_follower_role(corpus_id, follower_id):
# role_name = request.json role_name = request.json
# if not isinstance(role_name, str): if not isinstance(role_name, str):
# abort(400) abort(400)
# cfr = CorpusFollowerRole.query.filter_by(name=role_name).first() cfr = CorpusFollowerRole.query.filter_by(name=role_name).first()
# if cfr is None: if cfr is None:
# abort(400) abort(400)
# cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
# cfa.role = cfr cfa.role = cfr
# db.session.commit() db.session.commit()
# response_data = { response_data = {
# 'message': f'User "{cfa.follower.username}" is now {cfa.role.name}', 'message': f'User "{cfa.follower.username}" is now {cfa.role.name}',
# 'category': 'corpus' 'category': 'corpus'
# } }
# return response_data, 200 return response_data, 200
# @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>', methods=['DELETE']) @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>', methods=['DELETE'])
# def delete_corpus_follower(corpus_id, follower_id): def delete_corpus_follower(corpus_id, follower_id):
# cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
# if not ( if not (
# current_user.id == follower_id current_user.id == follower_id
# or current_user == cfa.corpus.user or current_user == cfa.corpus.user
# or CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first().role.has_permission('MANAGE_FOLLOWERS') or CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first().role.has_permission('MANAGE_FOLLOWERS')
# or current_user.is_administrator()): or current_user.is_administrator()):
# abort(403) abort(403)
# if current_user.id == follower_id: if current_user.id == follower_id:
# flash(f'You are no longer following "{cfa.corpus.title}"', 'corpus') flash(f'You are no longer following "{cfa.corpus.title}"', 'corpus')
# response = make_response() response = make_response()
# response.status_code = 204 response.status_code = 204
# else: else:
# response_data = { response_data = {
# 'message': f'"{cfa.follower.username}" is not following "{cfa.corpus.title}" anymore', 'message': f'"{cfa.follower.username}" is not following "{cfa.corpus.title}" anymore',
# 'category': 'corpus' 'category': 'corpus'
# } }
# response = jsonify(response_data) response = jsonify(response_data)
# response.status_code = 200 response.status_code = 200
# cfa.follower.unfollow_corpus(cfa.corpus) cfa.follower.unfollow_corpus(cfa.corpus)
# db.session.commit() db.session.commit()
# return response return response

17
app/corpora/routes.py
View File

@ -71,7 +71,6 @@ def corpus(corpus_id):
users = users users = users
) )
if (current_user.is_following_corpus(corpus) or corpus.is_public): if (current_user.is_following_corpus(corpus) or corpus.is_public):
abort(403)
cfas = CorpusFollowerAssociation.query.filter(Corpus.id == corpus_id, CorpusFollowerAssociation.follower_id != corpus.user.id).all() cfas = CorpusFollowerAssociation.query.filter(Corpus.id == corpus_id, CorpusFollowerAssociation.follower_id != corpus.user.id).all()
print(cfas) print(cfas)
return render_template( return render_template(
@ -99,14 +98,14 @@ def analysis(corpus_id):
) )
# @bp.route('/<hashid:corpus_id>/follow/<token>') @bp.route('/<hashid:corpus_id>/follow/<token>')
# def follow_corpus(corpus_id, token): def follow_corpus(corpus_id, token):
# corpus = Corpus.query.get_or_404(corpus_id) corpus = Corpus.query.get_or_404(corpus_id)
# if current_user.follow_corpus_by_token(token): if current_user.follow_corpus_by_token(token):
# db.session.commit() db.session.commit()
# flash(f'You are following "{corpus.title}" now', category='corpus') flash(f'You are following "{corpus.title}" now', category='corpus')
# return redirect(url_for('corpora.corpus', corpus_id=corpus_id)) return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
# abort(403) abort(403)
@bp.route('/import', methods=['GET', 'POST']) @bp.route('/import', methods=['GET', 'POST'])