- Timestamp:
- 03/02/10 10:26:18 (2 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
framework/server/branches/1.2/mapfish/controllers/printer.py
r3083 r3388 28 28 import simplejson 29 29 30 from routes import url_for31 30 from pylons.controllers import WSGIController 32 from pylons import config, request, response, session 31 from pylons import config, request, response, session, url 33 32 from pylons.controllers.util import forward 34 33 … … 74 73 if ret == 0: 75 74 response.status = 200 76 response.headers['Content-Type'] = 'application/json; charset=utf-8'77 75 result = self._addURLs(result) 78 76 if request.params.has_key('var'): 77 response.headers['Content-Type'] = 'text/javascript; charset=utf-8' 79 78 return 'var ' + request.params['var'].encode('utf8') + '=' + result + ';' 80 79 else: 80 response.headers['Content-Type'] = 'application/json; charset=utf-8' 81 81 return result 82 82 else: … … 206 206 actions of this controller. 207 207 """ 208 actionUrl = url _for(action = actionName, id =id)208 actionUrl = url(controller="printer", action=actionName, id=id) 209 209 if request.params.has_key('url'): 210 210 fullUrl = request.params['url'].encode('utf8') 211 myUrl = url _for(action =fromAction)211 myUrl = url(controller="printer", action=fromAction) 212 212 if fullUrl == myUrl[1:]: # support for very short relative URLs 213 213 return actionUrl[1:]
