Revert "Leave slug empty until we are sure media processing was successful."

This reverts commit f67611fb485b5a84cedc62b73beb1e551e8cb934.

For some reason, generating a slug here throws an integrity error during
a query when there is a duplicate slug.
This commit is contained in:
Rodney Ewing 2013-08-08 15:49:33 -07:00
parent 4de7db6fef
commit b26edfb944
3 changed files with 5 additions and 2 deletions

View File

@ -61,6 +61,8 @@ def post_entry(request):
entry.description = unicode(request.form.get('description'))
entry.license = unicode(request.form.get('license', ''))
entry.generate_slug()
# queue appropriately
queue_file = prepare_queue_task(request.app, entry, media_file.filename)

View File

@ -94,8 +94,6 @@ class ProcessMedia(task.Task):
# We set the state to processed and save the entry here so there's
# no need to save at the end of the processing stage, probably ;)
entry.state = u'processed'
#Generate the slug here rather than earlier when it could have failed.
entry.generate_slug()
entry.save()
# Notify the PuSH servers as async task

View File

@ -78,6 +78,9 @@ def submit_start(request):
entry.tags = convert_to_tag_list_of_dicts(
submit_form.tags.data)
# Generate a slug from the title
entry.generate_slug()
queue_file = prepare_queue_task(request.app, entry, filename)
with queue_file: