mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Update User Card and Share link with specific role
This commit is contained in:
		@@ -68,11 +68,12 @@ def disable_corpus_is_public(corpus_id):
 | 
			
		||||
@bp.route('/<hashid:corpus_id>/follow/<token>')
 | 
			
		||||
@login_required
 | 
			
		||||
def follow_corpus(corpus_id, token):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
    corpus = current_user.verify_follow_corpus_token(token)['corpus']
 | 
			
		||||
    role = current_user.verify_follow_corpus_token(token)['role']
 | 
			
		||||
    if not (current_user.is_authenticated and current_user.verify_follow_corpus_token(token)):
 | 
			
		||||
        abort(403)
 | 
			
		||||
    if not current_user.is_following_corpus(corpus) and current_user != corpus.user:
 | 
			
		||||
        current_user.follow_corpus(corpus)
 | 
			
		||||
        current_user.follow_corpus(corpus, role)
 | 
			
		||||
        db.session.commit()
 | 
			
		||||
        flash(f'You are following {corpus.title} now', category='corpus')
 | 
			
		||||
    return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
 | 
			
		||||
@@ -164,20 +165,24 @@ def create_corpus():
 | 
			
		||||
def corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
    exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y')
 | 
			
		||||
    roles = [x.name for x in CorpusFollowerRole.query.all()]
 | 
			
		||||
    if corpus.user == current_user or current_user.is_administrator():
 | 
			
		||||
        return render_template(
 | 
			
		||||
            'corpora/corpus.html.j2',
 | 
			
		||||
            corpus=corpus,
 | 
			
		||||
            exp_date=exp_date,
 | 
			
		||||
            roles=roles,
 | 
			
		||||
            title='Corpus'
 | 
			
		||||
        )
 | 
			
		||||
    if current_user.is_following_corpus(corpus) or corpus.is_public:
 | 
			
		||||
        corpus_files = [x.to_json_serializeable() for x in corpus.files]
 | 
			
		||||
        owner = corpus.user.to_json_serializeable()
 | 
			
		||||
        return render_template(
 | 
			
		||||
            'corpora/public_corpus.html.j2',
 | 
			
		||||
            corpus=corpus,
 | 
			
		||||
            corpus_files=corpus_files,
 | 
			
		||||
            title='Corpus'
 | 
			
		||||
            owner=owner,
 | 
			
		||||
            title='Corpus',
 | 
			
		||||
        )
 | 
			
		||||
    abort(403)
 | 
			
		||||
 | 
			
		||||
@@ -185,10 +190,10 @@ def corpus(corpus_id):
 | 
			
		||||
@login_required
 | 
			
		||||
def generate_corpus_share_link(corpus_id):
 | 
			
		||||
    data = request.get_json('data')
 | 
			
		||||
    # permission = data['permission']
 | 
			
		||||
    role = data['role']
 | 
			
		||||
    exp_data = data['expiration']
 | 
			
		||||
    expiration = datetime.strptime(exp_data, '%b %d, %Y')
 | 
			
		||||
    token = current_user.generate_follow_corpus_token(corpus_id, expiration)
 | 
			
		||||
    token = current_user.generate_follow_corpus_token(corpus_id, role, expiration)
 | 
			
		||||
    link = url_for('corpora.follow_corpus', corpus_id=corpus_id, token=token, _external=True)
 | 
			
		||||
    return link
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user