Skip to content

Commit

Permalink
Merge pull request #38 from carljm/fix-statusfield
Browse files Browse the repository at this point in the history
Fix StatusField and MonitorField bugs
  • Loading branch information
treyhunner committed Apr 9, 2013
2 parents f0b56c0 + 59e484e commit e1395c6
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions model_utils/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,17 @@ def __init__(self, *args, **kwargs):
self.check_for_status = not kwargs.pop('no_check_for_status', False)
super(StatusField, self).__init__(*args, **kwargs)

def contribute_to_class(self, cls, name):
if not cls._meta.abstract and self.check_for_status:
assert hasattr(cls, 'STATUS'), \
def prepare_class(self, sender, **kwargs):
if not sender._meta.abstract and self.check_for_status:
assert hasattr(sender, 'STATUS'), \
"To use StatusField, the model '%s' must have a STATUS choices class attribute." \
% cls.__name__
self._choices = cls.STATUS
% sender.__name__
self._choices = sender.STATUS
if not self.has_default():
self.default = tuple(cls.STATUS)[0][0] # set first as default
self.default = tuple(sender.STATUS)[0][0] # set first as default

def contribute_to_class(self, cls, name):
models.signals.class_prepared.connect(self.prepare_class, sender=cls)
super(StatusField, self).contribute_to_class(cls, name)


Expand Down

0 comments on commit e1395c6

Please sign in to comment.