From 14977ed860e9794040d21ebef50551b5e85c7fea Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 8 Jul 2014 16:01:16 -0400 Subject: [PATCH] Return an empty list for files in case of a staging folder exception --- mayan/apps/sources/resources.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mayan/apps/sources/resources.py b/mayan/apps/sources/resources.py index 5728fe92d5..3547343e37 100644 --- a/mayan/apps/sources/resources.py +++ b/mayan/apps/sources/resources.py @@ -1,11 +1,15 @@ from __future__ import absolute_import +import logging + from rest_framework import serializers from rest_framework.reverse import reverse from .classes import StagingFile from .models import StagingFolder +logger = logging.getLogger(__name__) + class SerializerStagingFolderFile(serializers.Serializer): url = serializers.SerializerMethodField('get_url') @@ -23,7 +27,11 @@ class SerializerStagingFolder(serializers.HyperlinkedModelSerializer): files = serializers.SerializerMethodField('get_files') def get_files(self, obj): - return [SerializerStagingFolderFile(entry).data for entry in obj.get_files()] + try: + return [SerializerStagingFolderFile(entry).data for entry in obj.get_files()] + except Exception as exception: + logger.error('unhandled exception: %s' % exception) + return [] class Meta: model = StagingFolder