Skip to content

Commit

Permalink
fixing typos
Browse files Browse the repository at this point in the history
  • Loading branch information
snyaggarwal committed Sep 11, 2020
1 parent ad0183c commit b2993de
Show file tree
Hide file tree
Showing 6 changed files with 713 additions and 6 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ __pycache__/*
*.db
src/*
**/test*.py
htmlcov/

2 changes: 1 addition & 1 deletion core/common/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def export_collection(self, version_id):
version.add_processing(self.request.id)
try:
logger.info('Found collection version %s. Beginning export...', version.version)
write_export_file(version, 'collection', 'core.collection.serializers.CollectionDetailSerializer', logger)
write_export_file(version, 'collection', 'core.collections.serializers.CollectionDetailSerializer', logger)
logger.info('Export complete!')
finally:
version.remove_processing(self.request.id)
Expand Down
3 changes: 1 addition & 2 deletions core/importers/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json

from django.utils.text import compress_string
from ocldev.oclfleximporter import OclFlexImporter

from core.common.utils import get_base_url
Expand All @@ -9,7 +8,7 @@

class ImportResults: # pragma: no cover
def __init__(self, importer):
self.json = compress_string(importer.import_results.to_json())
self.json = json.loads(importer.import_results.to_json())
self.detailed_summary = importer.import_results.get_detailed_summary()
self.report = importer.import_results.display_report()

Expand Down
5 changes: 3 additions & 2 deletions core/mappings/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db.models import F
from django.http import QueryDict
from django.shortcuts import get_object_or_404
from drf_yasg.utils import swagger_auto_schema
from pydash import get
Expand Down Expand Up @@ -103,14 +104,14 @@ def set_parent_resource(self):

def post(self, request, **kwargs): # pylint: disable=unused-argument
self.set_parent_resource()
data = request.data.dict() if isinstance(request.data, QueryDict) else request.data
serializer = self.get_serializer(data={
**request.data.dict(), 'parent_id': self.parent_resource.id
**data, 'parent_id': self.parent_resource.id
})
if serializer.is_valid():
self.object = serializer.save()
if serializer.is_valid():
headers = self.get_success_headers(serializer.data)
serializer = MappingDetailSerializer(self.object)
return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

Expand Down
2 changes: 1 addition & 1 deletion core/orgs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def destroy(self, request, *args, **kwargs):
try:
obj.delete()
except Exception as ex: # pragma: no cover
return Response({'detail': ex.message}, status=status.HTTP_400_BAD_REQUEST)
return Response({'detail': ex.args}, status=status.HTTP_400_BAD_REQUEST)

return Response({'detail': DELETE_SUCCESS}, status=status.HTTP_204_NO_CONTENT)

Expand Down
Loading

0 comments on commit b2993de

Please sign in to comment.