From 4867c4b3fc2db0845be9ca517b3d20e77b94d977 Mon Sep 17 00:00:00 2001 From: rpiazzi Date: Fri, 7 Oct 2011 14:24:46 +0000 Subject: Added condition for the case when mobile CCS is canceled. In this case the parameter error_within_iframe is true, but because of the redirecttarget parameter the application goes out of iframe. For this the backgrounnd template etc. have to be shown. git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@856 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- pdf-as-web/src/main/webapp/jsp/error.jsp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/src/main/webapp/jsp/error.jsp b/pdf-as-web/src/main/webapp/jsp/error.jsp index 7a5e970..c0f9977 100644 --- a/pdf-as-web/src/main/webapp/jsp/error.jsp +++ b/pdf-as-web/src/main/webapp/jsp/error.jsp @@ -72,9 +72,11 @@ %> <% - //If not within IFrame and the whole application also was not started within an IFrame + //First part: if not within IFrame and the whole application also was not started within an IFrame //we have to set the buergerkarte page as template - if ((!withiniframe) && (!startedFromIFrame)) { + //Second part is because mobile has redirect target _top and in case of cancel it would be redirected + //from what this prevents + if (((!withiniframe) && (!startedFromIFrame)) || ((!startedFromIFrame) && (((String)request.getAttribute("cause")).contains("Abbruch durch den Bürger über die Benutzerschnittstelle")))) { if (german) { %> <% } else { %> @@ -91,7 +93,7 @@ //If the whole application started from an IFrame there could be an external stylesheet if (!startedFromIFrame) { %> - + <% } else { %> <% } %> @@ -188,13 +190,14 @@ //If application not started within an iframe if (!startedFromIFrame) { %> <% - //If error didn't happen within IFrame (e.g. when online bku is called) - //The whole site has to be shown - if (!withiniframe) { %> + //First condition: if error didn't happen within IFrame (e.g. when local bku is called) the whole site has to be shown + //Second condition is because mobile has to have redirect target _top to redirect + //in case of successfull signature. But because of this also in case of cancel redirects + if ((!withiniframe) || (cause.contains("Abbruch durch den Bürger über die Benutzerschnittstelle"))) { %>

<% - if (testMode) { + if ((testMode) ) { %> <% } else { %> -- cgit v1.2.3