From 3df30b63f374dff03182ad3d61541997881fdc43 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 4 Nov 2016 01:34:12 -0400 Subject: [PATCH] Make sure the method has sensible defaults. --- mayan/apps/documents/models.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 22797878ce..4599e3a1bc 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -679,11 +679,13 @@ class DocumentPage(models.Model): def generate_image(self, *args, **kwargs): # Convert arguments into transformations transformations = kwargs.get('transformations', []) - size = kwargs.get('size', setting_display_size.value) - rotation = kwargs.get('rotation', DEFAULT_ROTATION) + # Set sensible defaults if the argument is not specified or if the + # argument is None - zoom_level = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL) + size = kwargs.get('size', setting_display_size.value) or setting_display_size.value + rotation = kwargs.get('rotation', DEFAULT_ROTATION) or DEFAULT_ROTATION + zoom_level = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL) or DEFAULT_ZOOM_LEVEL if zoom_level < setting_zoom_min_level.value: zoom_level = setting_zoom_min_level.value