Bugfix/issue95

ringo/lib/helpers/misc.py

@@ -343,7 +343,16 @@ def get_action_url(request, item, action):
     """
     route_name = get_action_routename(item, action)
     if isinstance(item, object):
-        return request.route_path(route_name, id=item.id)
+        # If backurl is set
+        if hasattr(request.context, "__model__"):
+            clazz = request.context.__model__
+            backurl = request.session.get('%s.backurl' % clazz)
+        else:
+            backurl = None
+        query = {}
+        if backurl:
+            query['backurl'] = backurl
+        return request.route_path(route_name, id=item.id, _query=query)
     # TODO: Is this code ever reached. See testcase (ti) <2014-02-25 23:17>
     return request.route_path(route_name)
 

ringo/lib/renderer/form.py

@@ -71,8 +71,9 @@ def get_link_url(item, request, actionname=None, backurl=False):
             return None
 
         query = {}
-        if not readmode and backurl:
-            query['backurl'] = request.current_route_path()
+        if backurl:
+            clazz = request.context.__model__
+            query['backurl'] = request.session.get('%s.backurl' % clazz) or request.current_route_path()
         return request.route_path(route_name, id=item.id, _query=query)
     return None