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

additional choice (upload another) on upload page

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-26 14:53:46 +02:00
parent 336ccb1c74
commit 704d7a9128
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/forms.py
View File

@@ -152,6 +152,11 @@ class WorkFlowMiddlePanelElement(forms.Form):
# The form to indicate additional actions to be performed immediately # The form to indicate additional actions to be performed immediately
# after a successful upload # after a successful upload
nextpages = list(landingpages)
nextpages.append(('workout_upload_view','Upload Another File'))
nextpages = tuple(nextpages)
class UploadOptionsForm(forms.Form): class UploadOptionsForm(forms.Form):
plotchoices = ( plotchoices = (
('timeplot','Time Plot'), ('timeplot','Time Plot'),
@@ -181,7 +186,7 @@ class UploadOptionsForm(forms.Form):
makeprivate = forms.BooleanField(initial=False,required=False, makeprivate = forms.BooleanField(initial=False,required=False,
label='Make Workout Private') label='Make Workout Private')
landingpage = forms.ChoiceField(choices=landingpages, landingpage = forms.ChoiceField(choices=nextpages,
initial='workout_edit_view', initial='workout_edit_view',
label='Landing Page') label='Landing Page')

2
rowers/urls.py
View File

@@ -177,7 +177,7 @@ urlpatterns = [
url(r'^graph/(?P<id>\d+)/deleteconfirm$',views.graph_delete_confirm_view), url(r'^graph/(?P<id>\d+)/deleteconfirm$',views.graph_delete_confirm_view),
url(r'^graph/(?P<id>\d+)/delete$',views.graph_delete_view), url(r'^graph/(?P<id>\d+)/delete$',views.graph_delete_view),
url(r'^workout/upload/team/$',views.team_workout_upload_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<id>\d+)/histo$',views.workout_histo_view), url(r'^workout/(?P<id>\d+)/histo$',views.workout_histo_view),
url(r'^workout/(?P<id>\d+)/task$',views.workout_test_task_view), url(r'^workout/(?P<id>\d+)/task$',views.workout_test_task_view),
url(r'^workout/(?P<id>\d+)/forcecurve$',views.workout_forcecurve_view), url(r'^workout/(?P<id>\d+)/forcecurve$',views.workout_forcecurve_view),

4
rowers/views.py
View File

@@ -7803,10 +7803,14 @@ def workout_upload_view(request,
else: else:
messages.error(request,message) messages.error(request,message)
if landingpage != 'workout_upload_view':
url = reverse(landingpage, url = reverse(landingpage,
kwargs = { kwargs = {
'id':w.id, 'id':w.id,
}) })
else:
url = reverse(landingpage)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
response = render(request, response = render(request,

BIN
static/img/coxmate1a.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 87 KiB