projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restrict selected fields
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index e4226309af8cdbdf6728cef96803f9b17679e29e..e55c1610a2f2f46043d63f34ea74f505d90627f9 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-71,7
+71,12
@@
class Compiler(object):
def results_iter(self):
query = self.query
def results_iter(self):
query = self.query
- attrlist = [ x.db_column for x in query.model._meta.local_fields if x.db_column ]
+ if self.query.select_fields:
+ fields = self.query.select_fields
+ else:
+ fields = self.query.model._meta.fields
+
+ attrlist = [ x.db_column for x in fields if x.db_column ]
try:
vals = self.connection.search_s(
try:
vals = self.connection.search_s(
@@
-123,7
+128,7
@@
class Compiler(object):
pos += 1
continue
row = []
pos += 1
continue
row = []
- for field in iter(
query.model._meta.
fields):
+ for field in iter(fields):
if field.attname == 'dn':
row.append(dn)
elif hasattr(field, 'from_ldap'):
if field.attname == 'dn':
row.append(dn)
elif hasattr(field, 'from_ldap'):