Merge branch 'develop' into feature/spi
This commit is contained in:
@@ -413,6 +413,11 @@ def workout_import_view(request, source='c2'):
|
||||
url = reverse('workouts_view')
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
if request.method == 'GET':
|
||||
type_filter = request.GET.get('type', None)
|
||||
else:
|
||||
type_filter = None
|
||||
|
||||
try:
|
||||
_ = integration.open()
|
||||
except NoTokenError: # pragma: no cover
|
||||
@@ -463,7 +468,8 @@ def workout_import_view(request, source='c2'):
|
||||
before=before,
|
||||
after=after,
|
||||
startdate=startdate,
|
||||
enddate=enddate
|
||||
enddate=enddate,
|
||||
type_filter=type_filter
|
||||
)
|
||||
except NoTokenError: # pragma: no cover
|
||||
messages.error(request,"You must first make the connection to {source}".format(
|
||||
|
||||
Reference in New Issue
Block a user