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

Fixed validation in API post_entry.

Browse Source 
Added state to API get_entry_serializable
This commit is contained in:
Joar Wandborg 2012-09-17 23:54:27 +02:00
parent c92aa0d0b2
commit 09e528acbb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mediagoblin/plugins/api/tools.py
View File

@ -95,6 +95,7 @@ def get_entry_serializable(entry, urlgen):
'description': entry.description, 'description': entry.description,
'description_html': entry.description_html, 'description_html': entry.description_html,
'media_type': entry.media_type, 'media_type': entry.media_type,
'state': entry.state,
'permalink': entry.url_for_self(urlgen, qualified=True), 'permalink': entry.url_for_self(urlgen, qualified=True),
'media_files': get_media_file_paths(entry.media_files, urlgen)} 'media_files': get_media_file_paths(entry.media_files, urlgen)}

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

@ -20,6 +20,7 @@ import uuid
from os.path import splitext from os.path import splitext
from webob import exc, Response from webob import exc, Response
from cgi import FieldStorage
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from celery import registry from celery import registry
@ -43,10 +44,18 @@ _log = logging.getLogger(__name__)
@require_active_login @require_active_login
def post_entry(request): def post_entry(request):
_log.debug('Posting entry') _log.debug('Posting entry')
if request.method == 'OPTIONS':
return json_response({'status': 200})
if request.method != 'POST': if request.method != 'POST':
_log.debug('Must POST against post_entry')
return exc.HTTPBadRequest() return exc.HTTPBadRequest()
if not 'file' in request.POST or not hasattr(request.POST['file'], 'file'): if not 'file' in request.POST \
or not isinstance(request.POST['file'], FieldStorage) \
or not request.POST['file'].file:
_log.debug('File field not found')
return exc.HTTPBadRequest() return exc.HTTPBadRequest()
media_file = request.POST['file'] media_file = request.POST['file']