martin/TipPy
1
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Don't know

Browse Source
This commit is contained in:
Martin Bley
2016-06-07 16:52:22 +02:00
parent 62ec42297d
commit 7292957497
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tipp/views.py
View File

@@ -485,13 +485,17 @@ def logout(request):
def get_current_md(ls,season): def get_current_md(ls,season):
""" get current matchday """ """ get current matchday """
"""
try: try:
current_md = Match.objects.filter(leagueShortcut=ls, season=season, \ current_md = Match.objects.filter(leagueShortcut=ls, season=season, \
finished=False).order_by('matchday').values_list('matchday', \ finished=False).order_by('matchday').values_list('matchday', \
flat=True).distinct()[0] flat=True).distinct()[0]
except IndexError: except IndexError:
current_md = Match.objects.filter(leagueShortcut=ls, season=season).aggregate(Max('matchday')) current_md = Match.objects.filter(leagueShortcut=ls, season=season).aggregate(Max('matchday'))
except:
current_md = 34
"""
current_md = 34
return(current_md) return(current_md)
def get_current_ls(): def get_current_ls():

4
tippy/settings.py
View File

@@ -73,7 +73,7 @@ MEDIA_URL = '/media/'
# Don't put anything in this directory yourself; store your static files # Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS. # in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/" # 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/') MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
# URL prefix for static files. # URL prefix for static files.
@@ -85,7 +85,7 @@ STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static". # Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # 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 # List of finder classes that know how to find static files in