diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-09-30 10:21:21 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-09-30 15:43:44 -0400 |
| commit | d847ddfe1d4475e768c547b17642d3ed0894d54e (patch) | |
| tree | a6594ad5a4621295cbf115b61858103e8644fb91 /django | |
| parent | 4745ea1d27a154a44ed2cacb66b01d5de1f9e3d3 (diff) | |
Fixed #3871 -- Fixed regression introduced by 04a2a6b.
Added do_not_call_in_templates=True attribute to RelatedManagers
to prevent them from being called.
Thanks jbg@ for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 1 | ||||
| -rw-r--r-- | django/db/models/fields/related.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index f3d66eaf31..b34847b81d 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -335,6 +335,7 @@ def create_generic_related_manager(superclass): object_id_field_name = self.object_id_field_name, prefetch_cache_name = self.prefetch_cache_name, ) + do_not_call_in_templates = True def get_queryset(self): try: diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 6c1e96ad8c..6cd8d193f5 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -377,6 +377,7 @@ def create_foreign_related_manager(superclass, rel_field, rel_model): manager = getattr(self.model, kwargs.pop('manager')) manager_class = create_foreign_related_manager(manager.__class__, rel_field, rel_model) return manager_class(self.instance) + do_not_call_in_templates = True def get_queryset(self): try: @@ -545,6 +546,7 @@ def create_many_related_manager(superclass, rel): through=self.through, prefetch_cache_name=self.prefetch_cache_name, ) + do_not_call_in_templates = True def get_queryset(self): try: |