heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove mongo style .id = ObjectId()

Browse Source 
On SQL we can't generate the primary key on our own. So
just remove this stuff.
This commit is contained in:
Elrond 2012-12-23 21:44:05 +01:00
parent b39d1f2351
commit ac8212fe65
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/plugins/api/views.py
View File

@ -25,7 +25,6 @@ from werkzeug.utils import secure_filename
from werkzeug.wrappers import Response from werkzeug.wrappers import Response
from celery import registry from celery import registry
from mediagoblin.db.util import ObjectId
from mediagoblin.decorators import require_active_login from mediagoblin.decorators import require_active_login
from mediagoblin.processing import mark_entry_failed from mediagoblin.processing import mark_entry_failed
from mediagoblin.processing.task import ProcessMedia from mediagoblin.processing.task import ProcessMedia
@ -61,7 +60,6 @@ def post_entry(request):
media_type, media_manager = sniff_media(media_file) media_type, media_manager = sniff_media(media_file)
entry = request.db.MediaEntry() entry = request.db.MediaEntry()
entry.id = ObjectId()
entry.media_type = unicode(media_type) entry.media_type = unicode(media_type)
entry.title = unicode(request.form.get('title') entry.title = unicode(request.form.get('title')
or splitext(media_file.filename)[0]) or splitext(media_file.filename)[0])

4
mediagoblin/submit/views.py
View File

@ -29,7 +29,6 @@ _log = logging.getLogger(__name__)
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from werkzeug.datastructures import FileStorage from werkzeug.datastructures import FileStorage
from mediagoblin.db.util import ObjectId
from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.text import convert_to_tag_list_of_dicts
from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.tools.response import render_to_response, redirect
@ -66,7 +65,6 @@ def submit_start(request):
# create entry and save in database # create entry and save in database
entry = request.db.MediaEntry() entry = request.db.MediaEntry()
entry.id = ObjectId()
entry.media_type = unicode(media_type) entry.media_type = unicode(media_type)
entry.title = ( entry.title = (
unicode(request.form['title']) unicode(request.form['title'])
@ -193,10 +191,8 @@ def add_collection(request, media=None):
if request.method == 'POST' and submit_form.validate(): if request.method == 'POST' and submit_form.validate():
try: try:
collection = request.db.Collection() collection = request.db.Collection()
collection.id = ObjectId()
collection.title = unicode(request.form['title']) collection.title = unicode(request.form['title'])
collection.description = unicode(request.form.get('description')) collection.description = unicode(request.form.get('description'))
collection.creator = request.user.id collection.creator = request.user.id
collection.generate_slug() collection.generate_slug()