From 37ea25c0c3ff2695eaa43dcce8c26675c55a30d8 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Tue, 11 Nov 2014 11:57:22 -0500 Subject: [PATCH] Ensure originating model is passed to ModelTree.add_select This requires modeltree 1.1.9+ Fix #269 Signed-off-by: Byron Ruth --- avocado/query/oldparsers/dataview.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/avocado/query/oldparsers/dataview.py b/avocado/query/oldparsers/dataview.py index de278ce..150b2a0 100644 --- a/avocado/query/oldparsers/dataview.py +++ b/avocado/query/oldparsers/dataview.py @@ -109,7 +109,7 @@ def _get_select(self, distinct): model_fields = [] for f in fields: - model_fields.append(f.label_field) + model_fields.append((f.model, f.label_field)) return model_fields diff --git a/requirements.txt b/requirements.txt index 3eb1598..34934cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ django-guardian>=1.0.4 django-haystack==2.0.0 django-objectset>=0.2.2 jsonfield>=0.9.4 -modeltree>=1.1.8 +modeltree>=1.1.9 openpyxl>=1.6,<1.7 python-memcached>=1.48 ordereddict>=1.1 diff --git a/setup.py b/setup.py index 9f1a2bb..09295be 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ install_requires = [ 'django>=1.4,<1.6', - 'modeltree>=1.1.8', + 'modeltree>=1.1.9', 'South==0.8.1', 'jsonfield==0.9.4', ]