mirror of
https://github.com/django/django.git
synced 2025-08-02 18:13:02 +00:00
Fixed #2445 -- Allowed limit_choices_to attribute to be a callable.
ForeignKey or ManyToManyField attribute ``limit_choices_to`` can now be a callable that returns either a ``Q`` object or a dict. Thanks michael at actrix.gen.nz for the original suggestion.
This commit is contained in:
parent
a718fcf201
commit
eefc88feef
15 changed files with 228 additions and 29 deletions
|
@ -8,6 +8,7 @@ words, most of these tests should be rewritten.
|
|||
"""
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import datetime
|
||||
import os
|
||||
import tempfile
|
||||
|
||||
|
@ -71,7 +72,6 @@ class Article(models.Model):
|
|||
status = models.PositiveIntegerField(choices=ARTICLE_STATUS, blank=True, null=True)
|
||||
|
||||
def save(self):
|
||||
import datetime
|
||||
if not self.id:
|
||||
self.created = datetime.date.today()
|
||||
return super(Article, self).save()
|
||||
|
@ -329,3 +329,21 @@ class CustomErrorMessage(models.Model):
|
|||
def clean(self):
|
||||
if self.name1 == 'FORBIDDEN_VALUE':
|
||||
raise ValidationError({'name1': [ValidationError('Model.clean() error messages.')]})
|
||||
|
||||
|
||||
def today_callable_dict():
|
||||
return {"last_action__gte": datetime.datetime.today()}
|
||||
|
||||
|
||||
def today_callable_q():
|
||||
return models.Q(last_action__gte=datetime.datetime.today())
|
||||
|
||||
|
||||
class Character(models.Model):
|
||||
username = models.CharField(max_length=100)
|
||||
last_action = models.DateTimeField()
|
||||
|
||||
|
||||
class StumpJoke(models.Model):
|
||||
most_recently_fooled = models.ForeignKey(Character, limit_choices_to=today_callable_dict, related_name="+")
|
||||
has_fooled_today = models.ManyToManyField(Character, limit_choices_to=today_callable_q, related_name="+")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue