decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

space

Browse source
This commit is contained in:
j 2017-06-09 09:25:43 +02:00
parent 696c4ecaee
commit ae3afc93c3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/annotation/views.py
View file

@ -34,7 +34,7 @@ def get_annotation_or_404_json(id):
def parse_query(data, user): def parse_query(data, user):
query = {} query = {}
query['range'] = [0, 100] query['range'] = [0, 100]
query['sort'] = [{'key':'in', 'operator':'+'}] query['sort'] = [{'key': 'in', 'operator': '+'}]
for key in ('keys', 'group', 'range', 'sort', 'query'): for key in ('keys', 'group', 'range', 'sort', 'query'):
if key in data: if key in data:
query[key] = data[key] query[key] = data[key]

8
pandora/app/config.py
View file

@ -278,11 +278,11 @@ def update_static():
if os.path.splitext(f)[-1] in ('.js', '.json'): if os.path.splitext(f)[-1] in ('.js', '.json'):
f = os.path.join(root, f) f = os.path.join(root, f)
os.system('gzip -9 -c "%s" > "%s.gz"' % (f, f)) os.system('gzip -9 -c "%s" > "%s.gz"' % (f, f))
for name in ('logo', 'icon', 'document'): for name in ('logo', 'icon', 'document'):
site = os.path.join(settings.STATIC_ROOT, 'png/%s.%s.png'%(name, settings.CONFIG['site']['id'])) site = os.path.join(settings.STATIC_ROOT, 'png/%s.%s.png' % (name, settings.CONFIG['site']['id']))
pandora = os.path.join(settings.STATIC_ROOT, 'png/%s.pandora.png'%name) pandora = os.path.join(settings.STATIC_ROOT, 'png/%s.pandora.png' % name)
image = os.path.join(settings.STATIC_ROOT, 'png/%s.png'%name) image = os.path.join(settings.STATIC_ROOT, 'png/%s.png' % name)
if not os.path.exists(image): if not os.path.exists(image):
if os.path.exists(site): if os.path.exists(site):
shutil.copyfile(site, image) shutil.copyfile(site, image)