aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-08-10 21:04:55 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-08-10 21:04:55 -0500
commit1b57c2908299111e571f6ac528291dd93a112b1b (patch)
treef5d417a579217f725100aba08f248e274e7aa9d2
parentd990a3799846a06ada11805ca4f2806eb1bf8b5e (diff)
parentf64e5250906401a3d5a5fc587521bc31e146859c (diff)
downloadmediagoblin-1b57c2908299111e571f6ac528291dd93a112b1b.tar.lz
mediagoblin-1b57c2908299111e571f6ac528291dd93a112b1b.tar.xz
mediagoblin-1b57c2908299111e571f6ac528291dd93a112b1b.zip
Merge branch 'master' into processing
-rw-r--r--mediagoblin/submit/views.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 53711236..d4858c87 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -20,6 +20,7 @@ from string import split
from werkzeug.utils import secure_filename
+from mediagoblin.db.util import ObjectId
from mediagoblin.util import (
render_to_response, redirect, cleaned_markdown_conversion, \
convert_to_tag_list_of_dicts)
@@ -51,6 +52,7 @@ def submit_start(request):
# create entry and save in database
entry = request.db.MediaEntry()
+ entry['_id'] = ObjectId()
entry['title'] = (
request.POST['title']
or unicode(splitext(filename)[0]))
@@ -66,10 +68,6 @@ def submit_start(request):
entry['tags'] = convert_to_tag_list_of_dicts(
request.POST.get('tags'))
- # Save, just so we can get the entry id for the sake of using
- # it to generate the file path
- entry.save(validate=False)
-
# Generate a slug from the title
entry.generate_slug()