fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix for django 1.9
[wolnelektury.git]
/
src
/
api
/
emitters.py
diff --git
a/src/api/emitters.py
b/src/api/emitters.py
index
40cc717
..
36babb2
100644
(file)
--- a/
src/api/emitters.py
+++ b/
src/api/emitters.py
@@
-9,6
+9,7
@@
When outputting a queryset of selected models, instead of returning
XML or JSON stanzas, SSI include statements are returned.
"""
XML or JSON stanzas, SSI include statements are returned.
"""
+from django.conf import settings
from django.core.urlresolvers import reverse
from django.db.models.query import QuerySet
from piston.emitters import Emitter, XMLEmitter, JSONEmitter
from django.core.urlresolvers import reverse
from django.db.models.query import QuerySet
from piston.emitters import Emitter, XMLEmitter, JSONEmitter
@@
-41,10
+42,11
@@
class SsiQS(object):
class SsiEmitterMixin(object):
def construct(self):
class SsiEmitterMixin(object):
def construct(self):
- if isinstance(self.data, QuerySet) and self.data.model in (Book, Fragment, Tag):
+ ssify_api = getattr(settings, 'SSIFY_API', True)
+ if ssify_api and isinstance(self.data, QuerySet) and self.data.model in (Book, Fragment, Tag):
return SsiQS(self.data)
else:
return SsiQS(self.data)
else:
- return super(SsiEmitterMixin, self).construct()
# WTF
+ return super(SsiEmitterMixin, self).construct()
class SsiJsonEmitter(SsiEmitterMixin, JSONEmitter):
class SsiJsonEmitter(SsiEmitterMixin, JSONEmitter):