[KSS-checkins] r39829 - kukit/kss.core/trunk/kss/core

[reebalazs at codespeak.net]

Author: reebalazs
Date: Sat Mar  3 17:56:07 2007
New Revision: 39829

Modified:
   kukit/kss.core/trunk/kss/core/azaxview.py
   kukit/kss.core/trunk/kss/core/commands.py
Log:
Move the setting of the content-type request header where it belongs to.

I believe it is safer to leave this explicit setting, independently what the final
 outcome of Hanno's patch will be.

Modified: kukit/kss.core/trunk/kss/core/azaxview.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/azaxview.py	(original)
+++ kukit/kss.core/trunk/kss/core/azaxview.py	Sat Mar  3 17:56:07 2007
@@ -134,10 +134,6 @@
 
     def render(self):
         """Views can use this to return their command set."""
-        # Always output text/xml to make sure browsers but the data in the
-        # responseXML instead of responseText attribute of the
-        # XMLHttpRequestobject.
-        self.request.RESPONSE.setHeader('Content-type', 'text/xml;charset=utf-8')
         return self.commands.render(self.request)
 
     def cancelRedirect(self):

Modified: kukit/kss.core/trunk/kss/core/commands.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/commands.py	(original)
+++ kukit/kss.core/trunk/kss/core/commands.py	Sat Mar  3 17:56:07 2007
@@ -191,8 +191,13 @@
     
     # XML output gets rendered via a page template
     # XXX note: barefoot rendering, use python: only after zope2.9
-    render = ViewPageTemplateFile('browser/kukitresponse.pt', content_type='text/xml;charset=utf-8')
+    # XXX we must have the content type set both here and below
+    _render = ViewPageTemplateFile('browser/kukitresponse.pt', content_type='text/xml;charset=utf-8')
 
-#    def render(self):
-#        result = self._render()
-#        return result
+    def render(self):
+        result = self._render()
+        # Always output text/xml to make sure browsers but the data in the
+        # responseXML instead of responseText attribute of the
+        # XMLHttpRequestobject.
+        self.request.RESPONSE.setHeader('Content-type', 'text/xml;charset=utf-8')
+        return result