git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Genericized penfield's migrations to allow for variations in the PHILO_PERSON_MODULE...
[philo.git]
/
models
/
base.py
diff --git
a/models/base.py
b/models/base.py
index
23cccb6
..
5d09f37
100644
(file)
--- a/
models/base.py
+++ b/
models/base.py
@@
-175,11
+175,15
@@
class QuerySetMapper(object, DictMixin):
def __getitem__(self, key):
try:
def __getitem__(self, key):
try:
-
return
self.queryset.get(key__exact=key).value
+
value =
self.queryset.get(key__exact=key).value
except ObjectDoesNotExist:
if self.passthrough is not None:
return self.passthrough.__getitem__(key)
raise KeyError
except ObjectDoesNotExist:
if self.passthrough is not None:
return self.passthrough.__getitem__(key)
raise KeyError
+ else:
+ if value is not None:
+ return value.value
+ return value
def keys(self):
keys = set(self.queryset.values_list('key', flat=True).distinct())
def keys(self):
keys = set(self.queryset.values_list('key', flat=True).distinct())