Added "merge_url" to document meta-data.

[redakcja.git] / apps / api / utils.py

diff --git a/apps/api/utils.py b/apps/api/utils.py
index 0e0468a..93e54be 100644 (file)
--- a/apps/api/utils.py
+++ b/apps/api/utils.py
@@ -18,8 +18,9 @@ class TextEmitter(Emitter):
     def render(self, request):
         return unicode(self.construct())
 
     def render(self, request):
         return unicode(self.construct())
 

-Emitter.register('text', TextEmitter, 'text/plain; charset=utf-8')
-Emitter.register('rawxml', TextEmitter, 'application/xml; charset=UTF-8')
+Emitter.register('raw', TextEmitter, 'text/plain; charset=utf-8')
+Emitter.register('rawhtml', TextEmitter, 'text/html; charset=utf-8')
+Emitter.register('rawxml', TextEmitter, 'application/xml; charset=utf-8')

 
 class DjangoAuth(object):
 
 
 class DjangoAuth(object):
 


@@ -38,7 +39,7 @@ def validate_form(formclass, source='GET'):
             form = formclass(getattr(request, source), request.FILES)
 
             if not form.is_valid():
             form = formclass(getattr(request, source), request.FILES)
 
             if not form.is_valid():

-                errorlist = [{'field': k, 'errors': e} for k, e in form.errors.items()]
+                errorlist = [{'field': k, 'errors': str(e)} for k, e in form.errors.items()]

                 return api.response.BadRequest().django_response(errorlist)
 
             kwargs['form'] = form
                 return api.response.BadRequest().django_response(errorlist)
 
             kwargs['form'] = form


@@ -52,8 +53,5 @@ def hglibrary(func):
         l = MercurialLibrary(settings.REPOSITORY_PATH)
         kwargs['lib'] = l
         return func(self, *args, **kwargs)
         l = MercurialLibrary(settings.REPOSITORY_PATH)
         kwargs['lib'] = l
         return func(self, *args, **kwargs)

-    return decorated
-    
-            
-        
+    return decorated