summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_widgets/models.py
diff options
context:
space:
mode:
authorMatt Boersma <matt@sprout.org>2009-01-16 21:18:21 +0000
committerMatt Boersma <matt@sprout.org>2009-01-16 21:18:21 +0000
commitb120c74032c1131e46e4073db1298cf92c4e34c3 (patch)
tree26758901d38e6af14e7c436fa35804dd9a4f4936 /tests/regressiontests/admin_widgets/models.py
parent547649f9627c9414aeda29600348ba3430644075 (diff)
Changed "date" column to "start_date"--Oracle won't name columns with reserved keywords.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_widgets/models.py')
-rw-r--r--tests/regressiontests/admin_widgets/models.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/regressiontests/admin_widgets/models.py b/tests/regressiontests/admin_widgets/models.py
index 345d73b0ea..1ba759b2d3 100644
--- a/tests/regressiontests/admin_widgets/models.py
+++ b/tests/regressiontests/admin_widgets/models.py
@@ -29,24 +29,24 @@ class Album(models.Model):
class HiddenInventoryManager(models.Manager):
def get_query_set(self):
- return super(HiddenInventoryManager, self).get_query_set().filter(hidden=False)
+ return super(HiddenInventoryManager, self).get_query_set().filter(hidden=False)
class Inventory(models.Model):
barcode = models.PositiveIntegerField(unique=True)
parent = models.ForeignKey('self', to_field='barcode', blank=True, null=True)
name = models.CharField(blank=False, max_length=20)
hidden = models.BooleanField(default=False)
-
+
# see #9258
default_manager = models.Manager()
objects = HiddenInventoryManager()
def __unicode__(self):
return self.name
-
+
class Event(models.Model):
band = models.ForeignKey(Band)
- date = models.DateField(blank=True, null=True)
+ start_date = models.DateField(blank=True, null=True)
start_time = models.TimeField(blank=True, null=True)
description = models.TextField(blank=True)
link = models.URLField(blank=True)
@@ -56,7 +56,7 @@ class Car(models.Model):
owner = models.ForeignKey(User)
make = models.CharField(max_length=30)
model = models.CharField(max_length=30)
-
+
def __unicode__(self):
return u"%s %s" % (self.make, self.model)
@@ -137,9 +137,9 @@ True
<input type="text" name="test" value="86" class="vForeignKeyRawIdAdminField" /><a href="../../../admin_widgets/inventory/?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>&nbsp;<strong>Apple</strong>
# see #9258
->>> hidden = Inventory.objects.create(barcode=93, name='Hidden', hidden=True)
+>>> hidden = Inventory.objects.create(barcode=93, name='Hidden', hidden=True)
>>> child_of_hidden = Inventory.objects.create(barcode=94, name='Child of hidden', parent=hidden)
->>> print w.render('test', child_of_hidden.parent_id, attrs={})
+>>> print w.render('test', child_of_hidden.parent_id, attrs={})
<input type="text" name="test" value="93" class="vForeignKeyRawIdAdminField" /><a href="../../../admin_widgets/inventory/?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>&nbsp;<strong>Hidden</strong>
""" % {
'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,