Changeset 2802

Timestamp:

05/01/06 14:04:30 (2 years ago)

Author:

jkocherhans

Message:

magic-removal: Refs #1681. Fixed side effect of [2800] on ManyToManyField?. Unfortunately this involved copying and pasting a method for now. This ought to be cleaned up when validation-aware models land.

Files:

• django/branches/magic-removal/django/db/models/fields/related.py (modified) (3 diffs)

django/branches/magic-removal/django/db/models/fields/related.py

@@ -76 +76 @@
-        # but this can be overridden with the "related_name" option.
-        return self.rel.related_name or opts.object_name.lower()
-
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-        params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
-        if self.rel.raw_id_admin:
-            field_objs = self.get_manipulator_field_objs()
-            params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
-        else:
-            if self.radio_admin:
-                field_objs = [forms.RadioSelectField]
-                params['ul_class'] = get_ul_class(self.radio_admin)
-            else:
-                if self.null:
-                    field_objs = [forms.NullSelectField]
-                else:
-                    field_objs = [forms.SelectField]
-            params['choices'] = self.get_choices_default()
-        return field_objs, params
-
-class SingleRelatedObjectDescriptor(object):
@@ -469 +452 @@
-        return '%s__%s__exact' % (self.name, self.rel.get_related_field().name)
-
+    def prepare_field_objs_and_params(self, manipulator, name_prefix):
+        params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
+        if self.rel.raw_id_admin:
+            field_objs = self.get_manipulator_field_objs()
+            params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
+        else:
+            if self.radio_admin:
+                field_objs = [forms.RadioSelectField]
+                params['ul_class'] = get_ul_class(self.radio_admin)
+            else:
+                if self.null:
+                    field_objs = [forms.NullSelectField]
+                else:
+                    field_objs = [forms.SelectField]
+            params['choices'] = self.get_choices_default()
+        return field_objs, params
+
-    def get_manipulator_field_objs(self):
-        rel_field = self.rel.get_related_field()
@@ -532 +532 @@
-    def get_validator_unique_lookup_type(self):
-        return '%s__%s__exact' % (self.name, self.rel.get_related_field().name)
+
+    # TODO: Copied from ForeignKey... putting this in RelatedField adversely affects
+    # ManyToManyField. This works for now.
+    def prepare_field_objs_and_params(self, manipulator, name_prefix):
+        params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
+        if self.rel.raw_id_admin:
+            field_objs = self.get_manipulator_field_objs()
+            params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
+        else:
+            if self.radio_admin:
+                field_objs = [forms.RadioSelectField]
+                params['ul_class'] = get_ul_class(self.radio_admin)
+            else:
+                if self.null:
+                    field_objs = [forms.NullSelectField]
+                else:
+                    field_objs = [forms.SelectField]
+            params['choices'] = self.get_choices_default()
+        return field_objs, params
-
-    def contribute_to_class(self, cls, name):