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:
		@@ -165,6 +165,7 @@ def corpus(corpus_id):
 | 
			
		||||
    if corpus.user == current_user or current_user.is_administrator():
 | 
			
		||||
        # now = datetime.utcnow()
 | 
			
		||||
        # payload = {
 | 
			
		||||
        #         'exp': now + timedelta(weeks=1),
 | 
			
		||||
        #         'iat': now,
 | 
			
		||||
        #         'iss': current_app.config['SERVER_NAME'],
 | 
			
		||||
        #         'sub': corpus.hashid
 | 
			
		||||
 
 | 
			
		||||
@@ -33,7 +33,7 @@ def dashboard():
 | 
			
		||||
    ]
 | 
			
		||||
    corpora = [
 | 
			
		||||
        c.to_json_serializeable() for c
 | 
			
		||||
        in Corpus.query.filter(Corpus.is_public == True).all()
 | 
			
		||||
        in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
 | 
			
		||||
    ]
 | 
			
		||||
    return render_template('main/dashboard.html.j2', title='Dashboard', users=users, corpora=corpora)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user