Merge tag 'v5.21' into develop

hotfix
2017-11-28 10:19:19 +01:00
parent bfb3d64792 fe64a6df21
commit 69ae507618
1 changed files with 10 additions and 1 deletions
@@ -8979,7 +8979,16 @@ def workout_upload_view(request,
 #	    f = request.FILES['file']
            f = form.cleaned_data['file']

-	    res = handle_uploaded_file(f)
+            if f is not None:
+	        res = handle_uploaded_file(f)
+            else:
+                messages.error("Something went wrong - no file attached")
+                url = reverse(workout_upload_view)
+                if is_ajax:
+                    return JSONResponse({'result':0,'url':0})
+                else:
+                    return HttpResponseRedirect(url)
+                
 	    t = form.cleaned_data['title']
 	    workouttype = form.cleaned_data['workouttype']
            request.session['docformoptions'] = {