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

Found a better solution for default role assignments

Browse Source
This commit is contained in:
Patrick Jentsch 2023-02-24 10:30:42 +01:00
parent ff3ac3658f
commit c565b08f9c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models.py
View File

@ -479,6 +479,8 @@ class CorpusFollowerAssociation(HashidMixin, db.Model):
)
def __init__(self, **kwargs):
if 'role' not in kwargs:
kwargs['role'] = CorpusFollowerRole.query.filter_by(default=True).first()
super().__init__(**kwargs)
def __repr__(self):
@ -575,13 +577,12 @@ class User(HashidMixin, UserMixin, db.Model):
)
def __init__(self, **kwargs):
super().__init__(**kwargs)
if self.role is not None:
return
if self.email == current_app.config['NOPAQUE_ADMIN']:
self.role = Role.query.filter_by(name='Administrator').first()
if 'role' not in kwargs:
if kwargs['email'] == current_app.config['NOPAQUE_ADMIN']:
kwargs['role'] = Role.query.filter_by(name='Administrator').first()
else:
self.role = Role.query.filter_by(default=True).first()
kwargs['role'] = Role.query.filter_by(default=True).first()
super().__init__(**kwargs)
def __repr__(self):
return f'<User {self.username}>'