diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
commit | c9685e638ee5de0d049c8f58fd91848c2dc8a0ba (patch) | |
tree | 110bcbb0463868a39eba0880336ff32cc545034e /id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | |
parent | 33b76e7bb23d8772b3a2533aadd0c3313af4b29f (diff) | |
parent | c109c1e86a228bd3b3ed49b97e182b3cd2136d00 (diff) | |
download | moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.gz moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.bz2 moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.zip |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
-rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index a3541c9a7..c56ad4847 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -39,6 +39,8 @@ <s:include value="snippets/OA/targetConfiguration.jsp"></s:include> <s:include value="snippets/OA/authentication.jsp"></s:include> + + <s:include value="snippets/OA/bPKDecryption.jsp"></s:include> <s:include value="snippets/OA/sso.jsp"></s:include> @@ -82,7 +84,7 @@ </div> <s:include value="snippets/OA/formCustomization.jsp"></s:include> - + <s:hidden name="formID" value="%{formID}"></s:hidden> |