# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1516381318 -3600
# Node ID 16d52917666c60b4131c7c3f41230e7435778aa3
# Parent  dfced79924601aa3dd49ce10298533534842ba22
pages: fixed redirection

diff -r dfced7992460 -r 16d52917666c src/server/pages.py
--- a/src/server/pages.py	Fri Jan 19 18:01:01 2018 +0100
+++ b/src/server/pages.py	Fri Jan 19 18:01:58 2018 +0100
@@ -370,7 +370,7 @@
         return os.path.join(self.url, *url_args)
 
     def getCurrentURL(self, request):
-        """retrieve URL use to access this page
+        """retrieve URL used to access this page
 
         @return(unicode): current URL
         """
@@ -655,7 +655,7 @@
             else:
                 redirect_page = redirect_page.original.children[subpage]
 
-        redirect_page.renderPage(request, skip_parse_url=True)
+        redirect_page.renderPage(request, skip_parse_url=skip_parse_url)
         raise failure.Failure(exceptions.CancelError(u'page redirection is used'))
 
     def pageError(self, request, code=C.HTTP_NOT_FOUND):
@@ -969,7 +969,7 @@
         d.addCallback(self._checkAccess, request)
 
         if self.redirect is not None:
-            self.pageRedirect(self.redirect, request, skip_parse_url=False)
+            d.addCallback(lambda dummy: self.pageRedirect(self.redirect, request, skip_parse_url=False))
 
         if self.parse_url is not None and not skip_parse_url:
             d.addCallback(self.parse_url, request)