diff --git a/tipp/views.py b/tipp/views.py index 676a29f..fdc16da 100644 --- a/tipp/views.py +++ b/tipp/views.py @@ -485,13 +485,17 @@ def logout(request): def get_current_md(ls,season): """ get current matchday """ + """ try: current_md = Match.objects.filter(leagueShortcut=ls, season=season, \ finished=False).order_by('matchday').values_list('matchday', \ flat=True).distinct()[0] except IndexError: current_md = Match.objects.filter(leagueShortcut=ls, season=season).aggregate(Max('matchday')) - + except: + current_md = 34 + """ + current_md = 34 return(current_md) def get_current_ls(): diff --git a/tippy/settings.py b/tippy/settings.py index d81afca..8711aeb 100644 --- a/tippy/settings.py +++ b/tippy/settings.py @@ -73,7 +73,7 @@ MEDIA_URL = '/media/' # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = '/home/martin/dev/tippy/TipPy/static/' +STATIC_ROOT = '/home/martin/Entwicklung/tippy/TipPy/static/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media/') # URL prefix for static files. @@ -85,7 +85,7 @@ STATICFILES_DIRS = ( # Put strings here, like "/home/html/static" or "C:/www/django/static". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - '/home/martin/dev/tippy/TipPy/tippy/static', + '/home/martin/Entwicklung/tippy/TipPy/tippy/static', ) # List of finder classes that know how to find static files in