diff --git a/rowers/forms.py b/rowers/forms.py index 34b14e4d..6980dafe 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -152,6 +152,11 @@ class WorkFlowMiddlePanelElement(forms.Form): # The form to indicate additional actions to be performed immediately # after a successful upload + +nextpages = list(landingpages) +nextpages.append(('workout_upload_view','Upload Another File')) +nextpages = tuple(nextpages) + class UploadOptionsForm(forms.Form): plotchoices = ( ('timeplot','Time Plot'), @@ -181,7 +186,7 @@ class UploadOptionsForm(forms.Form): makeprivate = forms.BooleanField(initial=False,required=False, label='Make Workout Private') - landingpage = forms.ChoiceField(choices=landingpages, + landingpage = forms.ChoiceField(choices=nextpages, initial='workout_edit_view', label='Landing Page') diff --git a/rowers/urls.py b/rowers/urls.py index a218c9b3..d33c32b6 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -177,7 +177,7 @@ urlpatterns = [ url(r'^graph/(?P\d+)/deleteconfirm$',views.graph_delete_confirm_view), url(r'^graph/(?P\d+)/delete$',views.graph_delete_view), url(r'^workout/upload/team/$',views.team_workout_upload_view), - url(r'^workout/upload/$',views.workout_upload_view), + url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'), url(r'^workout/(?P\d+)/histo$',views.workout_histo_view), url(r'^workout/(?P\d+)/task$',views.workout_test_task_view), url(r'^workout/(?P\d+)/forcecurve$',views.workout_forcecurve_view), diff --git a/rowers/views.py b/rowers/views.py index e40aedfb..346c35ab 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7803,10 +7803,14 @@ def workout_upload_view(request, else: messages.error(request,message) - url = reverse(landingpage, - kwargs = { - 'id':w.id, - }) + if landingpage != 'workout_upload_view': + url = reverse(landingpage, + kwargs = { + 'id':w.id, + }) + else: + url = reverse(landingpage) + return HttpResponseRedirect(url) else: response = render(request, diff --git a/static/img/coxmate1a.gif b/static/img/coxmate1a.gif new file mode 100644 index 00000000..51e68fd6 Binary files /dev/null and b/static/img/coxmate1a.gif differ