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

Merge tag 'v3.44' into develop

Browse Source 
hotfix
This commit is contained in:
Sander Roosendaal
2017-07-11 20:24:37 +02:00
parent 41c8df384d 1c91df79b3
commit 69df45143c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/views.py
+4
View File
@@ -3603,6 +3603,10 @@ def multiflex_view(request,userid=0,
except ValueError: except ValueError:
df['groupval'] = groups.mean()[groupby].fillna(value=0) df['groupval'] = groups.mean()[groupby].fillna(value=0)
groupcols = df['groupval'] groupcols = df['groupval']
except KeyError:
messages.error(request,'Data selection error')
url = reverse(user_multiflex_select)
return HttpResponseRedirect(url)
else: else:
try: try:
df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]] df['groupval'] = [x.strftime("%Y-%m-%d") for x in groups.min()[groupby]]