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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-08 16:02:58 +01:00
parent 21dbc43947 28d2664f38
commit 5708aebf1e
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/views.py
View File

@@ -2687,14 +2687,14 @@ def workout_flexchart3_view(request,*args,**kwargs):
workstrokesonly = False
# create interactive plot
res = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
script,div,js_resources,css_resources = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2,
promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly)
script = res[0]
div = res[1]
js_resources = res[2]
css_resources = res[3]
# script = res[0]
# div = res[1]
# js_resources = res[2]
# css_resources = res[3]
if row.workouttype == 'water':
return render(request,
@@ -4560,13 +4560,9 @@ def rower_favoritecharts_view(request):
FavoriteChart.objects.filter(user=r).delete()
FavoriteChart.objects.bulk_create(new_instances)
successmessage = "You have updated your favorites"
FavoriteChartFormSet=formset_factory(FavoriteForm,formset=BaseFavoriteFormSet)
print new_instances
print "aap",len(new_instances)
if len(new_instances)==0:
FavoriteChartFormSet=formset_factory(FavoriteForm,formset=BaseFavoriteFormSet,extra=1)
favorites_formset = FavoriteChartFormSet()
favorites_formset = FavoriteChartFormSet()
except IntegrityError:
message = "something went wrong"