diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/js/common.js | 18 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 24 |
2 files changed, 1 insertions, 41 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index d31a65d87..18c755f4b 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -22,32 +22,15 @@ *******************************************************************************/ function oaBusinessService() { if ($('#OAisbusinessservice').attr('checked') == 'checked') { - $('#OAisstorkservice').attr('checked',false); - $('#oa_config_storkservice').css('display', "none"); $('#oa_config_businessservice').css('display', "block"); $('#oa_config_publicservice').css('display', "none"); } else { - $('#oa_config_storkservice').css('display', "none"); $('#oa_config_businessservice').css('display', "none"); $('#oa_config_publicservice').css('display', "block"); } } -function oaStorkService() { - if ($('#OAisstorkservice').attr('checked') == 'checked') { - $('#OAisbusinessservice').attr('checked',false); - $('#oa_config_storkservice').css('display', "block"); - $('#oa_config_businessservice').css('display', "none"); - $('#oa_config_publicservice').css('display', "none"); - - } else { - $('#oa_config_storkservice').css('display', "none"); - $('#oa_config_businessservice').css('display', "none"); - $('#oa_config_publicservice').css('display', "block"); - - } -} function oaSSOService() { if ($('#OAuseSSO').attr('checked') == 'checked') { @@ -214,7 +197,6 @@ function userOnLoad() { return true; } function oaOnLoad() { - oaStorkService(); oaBusinessService(); oaSSOService(); oaLegacyService(); diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index 94f4a9d21..20a5ad1ea 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -70,17 +70,6 @@ > </s:checkbox> - <s:if test="authUser.isAdmin()"> - <s:checkbox name="generalOA.storkService" - value="%{generalOA.storkService}" - labelposition="left" - key="webpages.oaconfig.general.isstorkservice" - cssClass="checkbox" - onclick="oaStorkService();" - id="OAisstorkservice" - disabled="%{isOnlyStorkService()}"> - </s:checkbox> - </s:if> </div> @@ -532,18 +521,7 @@ cssClass="checkbox" id="OAuseVidp" /></p> - <div id="oa_config_storkservice" class="oa_config_block"> -<%-- <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3> --%> - <s:textfield name="generalOA.storkSPTargetCountry" - labelposition="left" - key="webpages.oaconfig.general.stork.countrycode" - value="%{generalOA.storkSPTargetCountry}" - cssClass="textfield_middle" - disabled="%{isDeactivatedStorkService()}"> - </s:textfield> - </div> - - <p><s:checkbox name="storkOA.requireConsent" + <p><s:checkbox name="storkOA.requireConsent" value="%{storkOA.requireConsent}" labelposition="left" key="webpages.oaconfig.vidp.requireconsent" |