Changeset 3386

Timestamp:

03/02/10 10:15:43 (2 years ago)

Author:

elemoine

Message:

print controller doesn't work with Routes 1.12, r=bbinet (closes #560)

Files:

• framework/server/trunk/mapfish/controllers/printer.py (modified) (2 diffs)

framework/server/trunk/mapfish/controllers/printer.py

@@ -28 +28 @@
 import simplejson
 
-from routes import url_for
 from pylons.controllers import WSGIController
-from pylons import config, request, response, session
+from pylons import config, request, response, session, url
 from pylons.controllers.util import forward
 
@@ -207 +206 @@
         actions of this controller.
         """
-        actionUrl = url_for(action = actionName, id = id)
+        actionUrl = url(controller="printer", action=actionName, id=id)
         if request.params.has_key('url'):
             fullUrl = request.params['url'].encode('utf8')
-            myUrl = url_for(action = fromAction)
+            myUrl = url(controller="printer", action=fromAction)
             if fullUrl == myUrl[1:]:  # support for very short relative URLs
                 return actionUrl[1:]