events: initialize event_v properly
parent
67bfe5a5bd
commit
03e7b4c6a2
|
@ -1,10 +1,11 @@
|
||||||
from typing import Union
|
from typing import Optional, Union
|
||||||
from sqlalchemy.orm import scoped_session
|
from sqlalchemy.orm import scoped_session
|
||||||
|
|
||||||
from files.events.classes.eventuser import EventUser
|
from files.events.classes.eventuser import EventUser
|
||||||
from files.classes.user import User
|
from files.classes.user import User
|
||||||
|
|
||||||
def get_or_create_event_user(target:Union[int, User], db:scoped_session) -> EventUser:
|
def get_or_create_event_user(target:Union[int, User], db:scoped_session) -> Optional[EventUser]:
|
||||||
|
if target is None: return None
|
||||||
if isinstance(target, User): target = target.id # type: ignore
|
if isinstance(target, User): target = target.id # type: ignore
|
||||||
user = db.get(EventUser, target)
|
user = db.get(EventUser, target)
|
||||||
if not user:
|
if not user:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% if not (v and v.poor) and (not event_v or event_v.event_music) and not (sub and sub.name == 'music') %}
|
{% if not (v and v.poor) and (not g.event_v or g.event_v.event_music) and not (sub and sub.name == 'music') %}
|
||||||
{% if not song %}
|
{% if not song %}
|
||||||
{% set path = "assets/media/event/music" %}
|
{% set path = "assets/media/event/music" %}
|
||||||
{% set song = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %}
|
{% set song = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %}
|
||||||
|
|
|
@ -80,6 +80,9 @@ def get_logged_in_user():
|
||||||
abort(403)
|
abort(403)
|
||||||
|
|
||||||
g.v = v
|
g.v = v
|
||||||
|
if HOLIDAY_EVENT:
|
||||||
|
from files.events.helpers.get import get_or_create_event_user
|
||||||
|
g.event_v = get_or_create_event_user(v, g.db)
|
||||||
|
|
||||||
if v:
|
if v:
|
||||||
v.poor = session.get('poor')
|
v.poor = session.get('poor')
|
||||||
|
|
Loading…
Reference in New Issue