Private
Public Access
1
0

Merge tag 'register' into develop

gzip support
This commit is contained in:
Sander Roosendaal
2017-02-14 16:24:15 +01:00
2 changed files with 9 additions and 1 deletions

View File

@@ -39,6 +39,12 @@ from sqlalchemy import create_engine
import sqlalchemy as sa import sqlalchemy as sa
import sys import sys
import django_rq
queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('low')
user = settings.DATABASES['default']['USER'] user = settings.DATABASES['default']['USER']
password = settings.DATABASES['default']['PASSWORD'] password = settings.DATABASES['default']['PASSWORD']
database_name = settings.DATABASES['default']['NAME'] database_name = settings.DATABASES['default']['NAME']

View File

@@ -48,7 +48,9 @@ def format_time(x,pos=None):
def validate_file_extension(value): def validate_file_extension(value):
import os import os
ext = os.path.splitext(value.name)[1] ext = os.path.splitext(value.name)[1]
valid_extensions = ['.tcx','.csv','.TCX','.CSV','.fit','.FIT','.zip','.ZIP'] valid_extensions = ['.tcx','.csv','.TCX',
'.CSV','.fit','.FIT','.zip','.ZIP',
'.gz','.GZ']
if not ext in valid_extensions: if not ext in valid_extensions:
raise ValidationError(u'File not supported!') raise ValidationError(u'File not supported!')