Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

2013-09-18 22:23:36 +05:30
parent 4346331c2a 28eab59ace
commit bca32cd474
34 changed files with 7817 additions and 229 deletions
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -314,6 +314,11 @@ def media_confirm_delete(request):
    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(