From 2f458841dc2b3d1036853c7bd4428b4f01becc95 Mon Sep 17 00:00:00 2001 From: rpiazzi Date: Fri, 7 Oct 2011 15:52:44 +0000 Subject: Reject the last changes for handling ExternalErrorException. Added adequate exception handling at: at.gv.egiz.pdfas.web.servlets.DataURLServlet:doPost:162 git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@857 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- pdf-as-web/src/main/webapp/jsp/error.jsp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 c0f9977..754b74b 100644 --- a/pdf-as-web/src/main/webapp/jsp/error.jsp +++ b/pdf-as-web/src/main/webapp/jsp/error.jsp @@ -72,11 +72,9 @@ %> <% - //First part: if not within IFrame and the whole application also was not started within an IFrame + //If not within IFrame and the whole application also was not started within an IFrame //we have to set the buergerkarte page as template - //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 ((!withiniframe) && (!startedFromIFrame)) { if (german) { %> <% } else { %> @@ -190,10 +188,8 @@ //If application not started within an iframe if (!startedFromIFrame) { %> <% - //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 error didn't happen within IFrame (e.g. when local bku is called) the whole site has to be shown + if (!withiniframe) { %>

<% -- cgit v1.2.3