diff options
| author | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2013-01-31 21:03:12 +0000 |
|---|---|---|
| committer | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2013-01-31 21:03:12 +0000 |
| commit | ed8302890d8ecf95779df87ef5de8845fb3d3171 (patch) | |
| tree | 55349e00c3c0a3006e4c167805b268b2d14fec80 | |
| parent | bced6cde8a453a6f3123332b3f7686a94a6d7179 (diff) | |
| download | mocca-ed8302890d8ecf95779df87ef5de8845fb3d3171.tar.gz mocca-ed8302890d8ecf95779df87ef5de8845fb3d3171.tar.bz2 mocca-ed8302890d8ecf95779df87ef5de8845fb3d3171.zip | |
Allow RedirectTarget to be set in OnlineBKU
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1162 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
| -rw-r--r-- | BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java | 12 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/applet.jsp | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java index 9cb9360c..aba12365 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java +++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java @@ -53,16 +53,18 @@ public class MoccaParameterBean { public static final String PARAM_APPLET_HEIGHT = "appletHeight"; public static final String PARAM_APPLET_BACKGROUND = "appletBackground"; - + + public static final String PARAM_REDIRECT_TARGET = "redirectTarget"; + public static final String PARAM_APPLET_BACKGROUND_COLOR = "appletBackgroundColor"; public static final Pattern PATTERM_APPLET_BACKGROUND_COLOR = Pattern.compile("\\#[0-9a-fA-F]{6}"); - + public static final String PARAM_APPLET_GUI_STYLE = "appletGuiStyle"; public static final String[] VALUES_APPLET_GUI_STYLE = new String[] {"tiny", "simple", "advanced"}; public static final String PARAM_APPLET_EXTENSION = "appletExtension"; public static final String[] VALUES_APPLET_EXTENSION = new String[] {"pin", "activation", - "getcertificate", "hardwareinfo", "identity"}; + "getcertificate", "hardwareinfo", "identity"}; public static final String PARAM_LOCALE = "locale"; public static final Pattern PATTERN_LOCALE = Pattern.compile("[a-zA-Z][a-zA-Z](_[a-zA-Z][a-zA-Z]){0,2}"); @@ -134,6 +136,10 @@ public class MoccaParameterBean { return null; } + public String getredirectTarget() { + return getString(PARAM_REDIRECT_TARGET); + } + public String getGuiStyle() { String guiStyle = getString(PARAM_APPLET_GUI_STYLE); if (guiStyle != null && !guiStyle.isEmpty()) { diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp index fff4d7c2..aada7f14 100644 --- a/BKUOnline/src/main/webapp/applet.jsp +++ b/BKUOnline/src/main/webapp/applet.jsp @@ -222,7 +222,7 @@ HelpURL : '<c:out value="${helpUrl}"/>', SessionID : '<c:out value="${requestScope.id}"/>', RedirectURL : '<c:out value="${resultUrl}"/>', - RedirectTarget: '_parent' + RedirectTarget: '<c:out value="${requestScope.moccaParam.redirectTarget}" default="_parent"/>' }; deployJava.runApplet(attributes, parameters, '<c:out value="${minJavaVersion}"/>'); } |