Changeset 8855 for django/trunk/django/db/models/options.py

Timestamp:

09/02/08 10:26:00 (4 months ago)

Author:

jacob

Message:

Fixed #8309: subclasses now inherit GenericForeignKey correctly. There's also now an internal API so that other "virtual fields" like GFK can be inherited as well. Thanks, msaelices.

Files:

• django/trunk/django/db/models/options.py (modified) (2 diffs)

django/trunk/django/db/models/options.py

@@ -27 +27 @@
-    def __init__(self, meta, app_label=None):
-        self.local_fields, self.local_many_to_many = [], []
+        self.virtual_fields = []
-        self.module_name, self.verbose_name = None, None
-        self.verbose_name_plural = None
@@ -156 +157 @@
-            del self._name_map
-
+    def add_virtual_field(self, field):
+        self.virtual_fields.append(field)
+
-    def setup_pk(self, field):
-        if not self.pk and field.primary_key: