aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/lib.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/submit/lib.py')
-rw-r--r--mediagoblin/submit/lib.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index ea24ec5c..ea05e00f 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -195,18 +195,18 @@ def submit_media(mg_app, user, submitted_file, filename,
else:
feed_url = None
+ add_comment_subscription(user, entry)
+
+ # Create activity
+ create_activity("post", entry, entry.uploader)
+ entry.save()
+
# Pass off to processing
#
# (... don't change entry after this point to avoid race
# conditions with changes to the document via processing code)
run_process_media(entry, feed_url)
- add_comment_subscription(user, entry)
-
- # Create activity
- entry.activity = create_activity("post", entry, entry.uploader).id
- entry.save()
-
return entry
@@ -291,11 +291,11 @@ def api_add_to_feed(request, entry):
qualified=True, user=request.user.username
)
- run_process_media(entry, feed_url)
add_comment_subscription(request.user, entry)
# Create activity
- entry.activity = create_activity("post", entry, entry.uploader).id
+ create_activity("post", entry, entry.uploader)
entry.save()
+ run_process_media(entry, feed_url)
return json_response(entry.serialize(request))