From 88c99a390bc2f8e9ffb645ac6e31a6e3690e4333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 8 Apr 2013 23:11:24 +0200 Subject: [PATCH] corregido bug en la navegaci?n de la libraryweb, ahora siempre se recuerda la p?gina del nivel superior --- YACReaderLibrary/server/controllers/foldercontroller.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/YACReaderLibrary/server/controllers/foldercontroller.cpp b/YACReaderLibrary/server/controllers/foldercontroller.cpp index b0179dfd..f6f0d543 100644 --- a/YACReaderLibrary/server/controllers/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontroller.cpp @@ -69,8 +69,11 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) int upPage = 0; + + if(backId == 1 && parentId == 1) { + session.popPage(); session.pushPage(page); t.setVariable(QString("upurl"),"/?page=0"); } @@ -85,11 +88,13 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) else //este nivel puede haberse cargado por primera vez ó puede que estemos navegando horizontalmente if(p.length() == 0) // acabamos de entrar { + upPage = session.topPage(); session.pushPage(page); } else //navegación horizontal { session.popPage(); + upPage = session.topPage(); session.pushPage(page); } t.setVariable(QString("upurl"),"/library/" + QUrl::toPercentEncoding(libraryName) + "/folder/" +QString("%1?page=%2&up=true").arg(backId).arg(upPage));