From 98ce0029735eb985187f01e17a0f11c831f8f818 Mon Sep 17 00:00:00 2001 From: bdc34 Date: Mon, 12 Jul 2010 15:18:16 +0000 Subject: [PATCH] Changing postEditCleanUp.jsp to handle cancel when resourceToRedirectTo is set. --- webapp/web/edit/postEditCleanUp.jsp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/webapp/web/edit/postEditCleanUp.jsp b/webapp/web/edit/postEditCleanUp.jsp index c7903247d..22c4ec531 100644 --- a/webapp/web/edit/postEditCleanUp.jsp +++ b/webapp/web/edit/postEditCleanUp.jsp @@ -34,11 +34,16 @@ predicateLocalName = prop.getLocalName(); } - if( editConfig.getEntityToReturnTo() != null && editConfig.getEntityToReturnTo().startsWith("?") ){ - resourceToRedirectTo = (String)request.getAttribute("entityToReturnTo"); + if( editConfig.getEntityToReturnTo() != null && editConfig.getEntityToReturnTo().startsWith("?") ){ + resourceToRedirectTo = (String)request.getAttribute("entityToReturnTo"); }else{ resourceToRedirectTo = editConfig.getEntityToReturnTo(); - } + } + + //if there is no entity to return to it is likely a cancel + if( resourceToRedirectTo == null || resourceToRedirectTo.length() == 0 ) + resourceToRedirectTo = editConfig.getSubjectUri(); + } //set up base URL