Ensure originating model is passed to ModelTree.add_select

This requires modeltree 1.1.9+ Fix #269 Signed-off-by: Byron Ruth <b@devel.io>
chop-dbhi · Nov 11, 2014 · 37ea25c · 37ea25c
1 parent 9b73aff
commit 37ea25c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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',
 ]