aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-09-18 11:21:57 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-09-18 11:21:57 -0500
commit28eab59acef05b5f38052941483f900d2e78c50b (patch)
tree67cfcdc247bdd856cd72798ee2492bdbafd31e47 /mediagoblin/user_pages
parent81e536e1a27626d5386b917cb1405eb1585e4f10 (diff)
parent0b95003cd4055745494cf10c89ccbfa6ac04c0e4 (diff)
downloadmediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.tar.lz
mediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.tar.xz
mediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.zip
Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'
Conflicts: mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/user_pages')
-rw-r--r--mediagoblin/user_pages/views.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 49691a29..5eac0fe4 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -296,6 +296,11 @@ def media_confirm_delete(request, media):
if request.method == 'POST' and form.validate():
if form.confirm.data is True:
username = media.get_uploader.username
+
+ media.get_uploader.uploaded = media.get_uploader.uploaded - \
+ media.file_size
+ media.get_uploader.save()
+
# Delete MediaEntry and all related files, comments etc.
media.delete()
messages.add_message(