Skip to content
This repository has been archived by the owner on Mar 24, 2021. It is now read-only.

Commit

Permalink
Merge branch 'fixing-file-upload' of github.com:alphagov/backdrop int…
Browse files Browse the repository at this point in the history
…o fixing-file-upload

Conflicts:
	backdrop/write/admin_ui.py
	backdrop/write/uploaded_file.py
  • Loading branch information
nick-gravgaard committed Dec 20, 2013
2 parents 26a2ae4 + 97fa2f5 commit afedfdb
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion backdrop/write/admin_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ def _store_data(bucket_config):
ParseError,
ValidationError) as e:
app.logger.error("Upload error: %s" % e.message)
return render_template("upload_error.html", message=e.message), 400
return render_template("upload_error.html",
message=e.message,
bucket_name=bucket.name), 400

return render_template('upload_ok.html')

Expand Down

0 comments on commit afedfdb

Please sign in to comment.