mirror
/
maloja
mirror of https://github.com/krateng/maloja.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup

This commit is contained in:
krateng 2022-02-26 21:51:33 +01:00
parent c952fab440
commit 631fd941ec
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maloja/database/sqldb.py
View File

@ -528,7 +528,7 @@ def get_artists_map(artist_ids,dbconn=None):
@cached_wrapper
@connection_provider
def get_associated_artists(dbconn=None,*artists):
def get_associated_artists(*artists,dbconn=None):
artist_ids = [get_artist_id(a) for a in artists]
jointable = sql.join(
@ -547,7 +547,7 @@ def get_associated_artists(dbconn=None,*artists):
@cached_wrapper
@connection_provider
def get_credited_artists(dbconn=None,*artists):
def get_credited_artists(*artists,dbconn=None):
artist_ids = [get_artist_id(a) for a in artists]
jointable = sql.join(

0
maloja/database_packed.py
View File

7
maloja/jinjaenv/context.py
View File

@ -1,4 +1,3 @@
from .. import database_packed
from . import filters
from ..globalconf import malojaconfig
@ -12,7 +11,7 @@ import math
# templating
from jinja2 import Environment, PackageLoader, select_autoescape
dbp = jinjaview.JinjaDBConnection()
#dbp = jinjaview.JinjaDBConnection()
jinja_environment = Environment(
loader=PackageLoader('maloja', "web/jinja"),
@ -26,8 +25,8 @@ def update_jinja_environment():
JINJA_CONTEXT = {
# maloja
"db": database,
"dbp":dbp,
"db": database, #TODO: move these to connection manager as well
#"dbp":dbp,
"malojatime": malojatime,
"utilities": utilities,
"mlj_uri": malojauri,