Merge branch 'developer' of http://git.vst.lan/cloud/polemarch

Author: onegreyonewhite

polemarch/api/v1/views.py

@@ -217,6 +217,7 @@ def supported_kinds(self, request):
 
 class BulkViewSet(rest_views.APIView):
     permission_classes = (StaffPermission,)
+    serializer_classes = serializers
 
     _op_types = {
         "add": "perform_create",
@@ -232,7 +233,7 @@ def get_serializer_class(self, item):
         if item not in self._allowed_types:
             raise excepts.UnsupportedMediaType(media_type=item)
         item = "One{}Serializer".format(item.title())
-        return getattr(serializers, item)
+        return getattr(self.serializer_classes, item)
 
     def get_serializer(self, *args, **kwargs):
         kwargs["context"] = {'request': self.request}

polemarch/main/utils.py

@@ -786,5 +786,5 @@ def _get_info(self, key):
         doc_data = load(data, Loader=Loader)
         result["data"] = OrderedDict()
         for field in self.fields:
-            result["data"][field] = doc_data[field]
+            result["data"][field] = doc_data.get(field, None)
         return result