Author: adrian
Date: 2006-04-09 22:35:56 -0500 (Sun, 09 Apr 2006)
New Revision: 2650
Modified:
django/trunk/django/contrib/admin/views/main.py
django/trunk/django/core/meta/__init__.py
django/trunk/django/core/meta/fields.py
django/trunk/django/models/__init__.py
Log:
Renamed OneToOne to OneToOneRel to be consistent with ManyToManyRel
Modified: django/trunk/django/contrib/admin/views/main.py
===================================================================
--- django/trunk/django/contrib/admin/views/main.py 2006-04-10 03:34:47 UTC
(rev 2649)
+++ django/trunk/django/contrib/admin/views/main.py 2006-04-10 03:35:56 UTC
(rev 2650)
@@ -560,7 +560,7 @@
continue
opts_seen.append(related.opts)
rel_opts_name = related.get_method_name_part()
- if isinstance(related.field.rel, meta.OneToOne):
+ if isinstance(related.field.rel, meta.OneToOneRel):
try:
sub_obj = getattr(obj, 'get_%s' % rel_opts_name)()
except ObjectDoesNotExist:
Modified: django/trunk/django/core/meta/__init__.py
===================================================================
--- django/trunk/django/core/meta/__init__.py 2006-04-10 03:34:47 UTC (rev
2649)
+++ django/trunk/django/core/meta/__init__.py 2006-04-10 03:35:56 UTC (rev
2650)
@@ -410,7 +410,7 @@
# Calculate one_to_one_field.
self.one_to_one_field = None
for f in self.fields:
- if isinstance(f.rel, OneToOne):
+ if isinstance(f.rel, OneToOneRel):
self.one_to_one_field = f
break
# Cache the primary-key field.
@@ -1038,7 +1038,7 @@
cursor = db.db.cursor()
for related in opts.get_all_related_objects():
rel_opts_name = related.get_method_name_part()
- if isinstance(related.field.rel, OneToOne):
+ if isinstance(related.field.rel, OneToOneRel):
try:
sub_obj = getattr(self, 'get_%s' % rel_opts_name)()
except ObjectDoesNotExist:
Modified: django/trunk/django/core/meta/fields.py
===================================================================
--- django/trunk/django/core/meta/fields.py 2006-04-10 03:34:47 UTC (rev
2649)
+++ django/trunk/django/core/meta/fields.py 2006-04-10 03:35:56 UTC (rev
2650)
@@ -133,7 +133,7 @@
# Set db_index to True if the field has a relationship and doesn't
explicitly set db_index.
if db_index is None:
- if isinstance(rel, OneToOne) or isinstance(rel, ManyToOneRel):
+ if isinstance(rel, OneToOneRel) or isinstance(rel, ManyToOneRel):
self.db_index = True
else:
self.db_index = False
@@ -811,7 +811,7 @@
warnings.warn("edit_inline_type is deprecated. Use edit_inline
instead.")
kwargs['edit_inline'] = kwargs.pop('edit_inline_type')
- kwargs['rel'] = OneToOne(to, to_field,
+ kwargs['rel'] = OneToOneRel(to, to_field,
num_in_admin=kwargs.pop('num_in_admin', 0),
edit_inline=kwargs.pop('edit_inline', False),
related_name=kwargs.pop('related_name', None),
@@ -855,7 +855,7 @@
self.raw_id_admin = raw_id_admin
assert not (self.raw_id_admin and self.filter_interface),
"ManyToManyRels may not use both raw_id_admin and filter_interface"
-class OneToOne(ManyToOneRel):
+class OneToOneRel(ManyToOneRel):
def __init__(self, to, field_name, num_in_admin=0, edit_inline=False,
related_name=None, limit_choices_to=None, lookup_overrides=None,
raw_id_admin=False):
Modified: django/trunk/django/models/__init__.py
===================================================================
--- django/trunk/django/models/__init__.py 2006-04-10 03:34:47 UTC (rev
2649)
+++ django/trunk/django/models/__init__.py 2006-04-10 03:35:56 UTC (rev
2650)
@@ -26,7 +26,7 @@
# generated.
rel_mod = related.opts.get_model_module()
rel_obj_name = related.get_method_name_part()
- if isinstance(related.field.rel, meta.OneToOne):
+ if isinstance(related.field.rel, meta.OneToOneRel):
# Add "get_thingie" methods for one-to-one related objects.
# EXAMPLE: Place.get_restaurants_restaurant()
func = curry(meta.method_get_related, 'get_object', rel_mod,
related.field)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
