sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v5.06'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-14 00:56:45 +01:00
parent 0028b93f30 14a10becf1
commit 343a64c794
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/uploads.py
View File

@@ -209,7 +209,8 @@ def upload_options(body):
if 'priva' in lowkey: if 'priva' in lowkey:
uploadoptions = getboolean(uploadoptions,value,'makeprivate') uploadoptions = getboolean(uploadoptions,value,'makeprivate')
except AttributeError: except AttributeError:
pass #pass
raise yaml.YAMLError
except yaml.YAMLError as exc: except yaml.YAMLError as exc:
try: try:
uploadoptions = getplotoptions_body2(uploadoptions,body) uploadoptions = getplotoptions_body2(uploadoptions,body)

5
rowers/views.py
View File

@@ -513,7 +513,10 @@ def get_thumbnails(request,id):
charts = [] charts = []
charts = thumbnails_set(r,id,favorites) charts = thumbnails_set(r,id,favorites)
if charts[0]['script'] == '': try:
if charts[0]['script'] == '':
charts = []
except IndexError:
charts = [] charts = []