Maxi/django-jsignature
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Improve handling of different values types

Browse Source
This commit is contained in:
Florent Lebreton
2013-09-18 10:50:19 +02:00
parent 86791e12f3
commit c4bb0b8fd1
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsignature/fields.py
View File

@@ -6,7 +6,8 @@ import json
from django.db import models
from django.core import validators
from django.core.exceptions import ValidationError
from .forms import JSignatureField as JSignatureFormField
from .forms import (JSignatureField as JSignatureFormField,
JSIGNATURE_EMPTY_VALUES)
class JSignatureField(models.Field):
"""
@@ -23,7 +24,7 @@ class JSignatureField(models.Field):
Validates that the input can be red as a JSON object. Returns a Python
datetime.date object.
"""
if value in validators.EMPTY_VALUES:
if value in JSIGNATURE_EMPTY_VALUES:
return None
elif isinstance(value, list):
return value
@@ -33,10 +34,7 @@ class JSignatureField(models.Field):
raise ValidationError('Invalid JSON format.')
def get_prep_value(self, value):
return self.to_python(value)
def get_db_prep_value(self, value, connection, prepared=False):
if value in validators.EMPTY_VALUES:
if value in JSIGNATURE_EMPTY_VALUES:
return None
elif isinstance(value, basestring):
return value