diff options
| -rw-r--r-- | mediagoblin/submit/lib.py | 16 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 7 |
2 files changed, 11 insertions, 12 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)) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index b6cbcabd..822f359a 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -195,15 +195,14 @@ def media_post_comment(request, media): messages.ERROR, _("Oops, your comment was empty.")) else: + create_activity("post", comment, comment.author, target=media) + add_comment_subscription(request.user, media) comment.save() messages.add_message( request, messages.SUCCESS, _('Your comment has been posted!')) - trigger_notification(comment, media, request) - create_activity("post", comment, comment.author, target=media) - add_comment_subscription(request.user, media) return redirect_obj(request, media) @@ -263,8 +262,8 @@ def media_collect(request, media): collection.description = form.collection_description.data collection.creator = request.user.id collection.generate_slug() - collection.save() create_activity("create", collection, collection.creator) + collection.save() # Otherwise, use the collection selected from the drop-down else: |