Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

[System] avatar URL needs to be generated as path might change

This commit is contained in:
Ferdinand Thiessen 2020-11-18 01:56:33 +01:00
parent 40651c3279
commit 6612a84cd3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flaschengeist/config.py
View File

@ -47,7 +47,7 @@ def configure_app(app):
logging.config.dictConfig(logger_config) logging.config.dictConfig(logger_config)
if "secret_key" not in config["FLASCHENGEIST"]: if "secret_key" not in config["FLASCHENGEIST"]:
logger.warn("No secret key was configured, please configure one for production systems!") logger.warning("No secret key was configured, please configure one for production systems!")
app.config["SECRET_KEY"] = "0a657b97ef546da90b2db91862ad4e29" app.config["SECRET_KEY"] = "0a657b97ef546da90b2db91862ad4e29"
else: else:
app.config["SECRET_KEY"] = config["FLASCHENGEIST"]["secret_key"] app.config["SECRET_KEY"] = config["FLASCHENGEIST"]["secret_key"]

7
flaschengeist/models/user.py
View File

@ -1,6 +1,7 @@
from datetime import date from datetime import date
from typing import Optional from typing import Optional
from flask import url_for
from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.orm.collections import attribute_mapped_collection
from . import ModelSerializeMixin from . import ModelSerializeMixin
@ -54,9 +55,9 @@ class User(db.Model, ModelSerializeMixin):
firstname: str = db.Column(db.String(50), nullable=False) firstname: str = db.Column(db.String(50), nullable=False)
lastname: str = db.Column(db.String(50), nullable=False) lastname: str = db.Column(db.String(50), nullable=False)
mail: str = db.Column(db.String(60), nullable=False) mail: str = db.Column(db.String(60), nullable=False)
avatar_url: Optional[str] = db.Column(db.String(60))
birthday: Optional[date] = db.Column(db.Date) birthday: Optional[date] = db.Column(db.Date)
roles: [str] = [] roles: [str] = []
avatar_url: Optional[str] = ""
roles_: [Role] = db.relationship("Role", secondary=association_table, cascade="save-update, merge") roles_: [Role] = db.relationship("Role", secondary=association_table, cascade="save-update, merge")
_id = db.Column("id", db.Integer, primary_key=True) _id = db.Column("id", db.Integer, primary_key=True)
@ -65,6 +66,10 @@ class User(db.Model, ModelSerializeMixin):
"_UserAttribute", collection_class=attribute_mapped_collection("name"), cascade="all, delete" "_UserAttribute", collection_class=attribute_mapped_collection("name"), cascade="all, delete"
) )
@property
def avatar_url(self):
return url_for('users.get_avatar', userid=self.userid)
@property @property
def roles(self): def roles(self):
return [role.name for role in self.roles_] return [role.name for role in self.roles_]