Skip to content

Commit

Permalink
Fix bug in django field.
Browse files Browse the repository at this point in the history
  • Loading branch information
Warren Smith committed Nov 28, 2016
1 parent fc710a6 commit ff93eef
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from setuptools import setup, find_packages

__version__ = "0.1.3"
__version__ = "0.1.4"


def file_read(filename):
Expand Down
22 changes: 11 additions & 11 deletions staticmodel/django/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,27 @@ def get_prep_value(self, member):

def to_python(self, db_value):
super_value = super(StaticModelFieldMixin, self).to_python(db_value)
if super_value is None:
return None
elif super_value == '':
return ''
else:
try:
return self._static_model.members.get(
**{self._value_field_name: super_value})
except self._static_model.DoesNotExist:
return None

def from_db_value(self, value, expression, connection, context):
try:
return self._static_model.members.get(**{self._value_field_name: value})
except self._static_model.DoesNotExist:
return None


class StaticModelCharField(
six.with_metaclass(models.SubfieldBase, StaticModelFieldMixin,
models.CharField)):
class StaticModelCharField(StaticModelFieldMixin, models.CharField):
def _validate_member_value(self, member, value):
if not isinstance(value, six.string_types):
raise ValueError('Field {!r} of member {!r} must be a string.'.format(
self._value_field_name, member._member_name))


class StaticModelIntegerField(
six.with_metaclass(models.SubfieldBase, StaticModelFieldMixin,
models.IntegerField)):
class StaticModelIntegerField(StaticModelFieldMixin, models.IntegerField):
def _validate_member_value(self, member, value):
if not isinstance(value, six.integer_types):
raise ValueError('Field {!r} of member {!r} must be an integer.'.format(
Expand Down

0 comments on commit ff93eef

Please sign in to comment.