Features:

-- Add additional parameters to customize BKUSelectionForm and SendAssertionForm
-- change Target configuration
-- insert some logging

Bugfixes:
-- Nullpointerexceptions in combination of an old userdatabase entry and a actual configuration tool version

2 files changed, 127 insertions, 96 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 0b69854da..ce2e51863 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -78,6 +78,17 @@ function HideAdminTarget() {
 	$('#adminTarget').removeAttr("checked");
 	$('#admin_target_area').css('display', "none");
 }
+function oaTargetSubSector() {
+	if ($('#OAisTargetSubSector').attr('checked') == 'checked') {
+		
+		$('#wwgrp_OAtarget_subsector').css('display', "block");
+		
+	} else {
+		
+		$('#wwgrp_OAtarget_subsector').css('display', "none");
+		
+	}
+}
 function UseUserNamePassword() {
 	if ($('#isusernamepasswordallowed').size() == 0) {
 		$('#usernamepassword_area').css('display', "none");
@@ -122,5 +133,6 @@ function oaOnLoad() {
 	oaSSOService();
 	oaLegacyService();
 	AdminTarget();
+	oaTargetSubSector();
 	return true;
 }
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 68d47d6b8..6bca21435 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -64,121 +64,119 @@
 							key="webpages.oaconfig.general.isbusinessservice"
 							cssClass="checkbox"
 							onclick="oaBusinessService();"
-							id="OAisbusinessservice">
+							id="OAisbusinessservice"
+							disabled="%{isOnlyBusinessService()}">
 						</s:checkbox>
 					</div>
 					
  					<div id="oa_config_businessservice" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
 						
-<%-- 						<s:select list="generalOA.identificationTypeList"
-											key="webpages.oaconfig.general.business.type"
-											labelposition="left"
-											cssClass="selectfield"
-											value="%{generalOA.identificationType}"
-											name="generalOA.identificationType">
-						</s:select> --%>
-						
 						<s:select list="generalOA.identificationTypeList"
 											key="webpages.oaconfig.general.business.value"
 											labelposition="left"
 											cssClass="selectfield"
 											value="%{generalOA.identificationType}"
-											name="generalOA.identificationType">
+											name="generalOA.identificationType"
+											disabled="%{isDeaktivededBusinessService()}">
 						</s:select>
 						
-<%-- 						<s:textfield name="generalOA.identificationNumber" 
-							value="%{generalOA.identificationNumber}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.business.value"
-							cssClass="selectfield">
-						</s:textfield>		 --%>
-						
 						<s:textfield name="generalOA.identificationNumber" 
 							value="%{generalOA.identificationNumber}" 
-							cssClass="textfield_middle">
+							cssClass="textfield_middle"
+							disabled="%{isDeaktivededBusinessService()}">
 						</s:textfield>		
 					</div>
 					
-					<div id="oa_config_publicservice" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
-						
-						<s:if test="authUser.isAdmin()">
-							<s:select list="generalOA.targetList"
-												key="webpages.oaconfig.general.target"
-												labelposition="left"
-												cssClass="selectfield"
-												value="%{generalOA.target}"
-												name="generalOA.target"
-												onchange="HideAdminTarget();">
-							</s:select>						
-						</s:if>
-						<s:else>
-							<s:select list="generalOA.targetList"
-												key="webpages.oaconfig.general.target"
-												labelposition="left"
-												cssClass="selectfield"
-												value="%{generalOA.target}"
-												name="generalOA.target">
-							</s:select>
-						</s:else>
-						
-						<s:textfield name="generalOA.target_subsector" 
-							value="%{generalOA.target_subsector}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.target.subsector"
-							cssClass="selectfield">
-						</s:textfield>
-						
-						
- 						<s:if test="authUser.isAdmin()">
- 							<s:checkbox
-	 							name="generalOA.AdminTarget" 
-								value="%{generalOA.AdminTarget}"
-								cssClass="checkbox"
- 								onclick="AdminTarget();"
- 								labelposition="left"
-								key="webpages.oaconfig.general.target.admin.checkbox"
-								id="adminTarget">
- 							</s:checkbox>
- 							
- 							<div id="admin_target_area">
-								<s:textfield name="generalOA.target_admin" 
-									value="%{generalOA.target_admin}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.target.admin"
-									cssClass="textfield_short">
-								</s:textfield>
-								<s:textfield name="generalOA.targetFriendlyName" 
-									value="%{generalOA.targetFriendlyName}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.target.friendlyname"
-									cssClass="textfield_long">
-								</s:textfield>
-							</div>
- 						</s:if>
- 						<s:else>
- 							<s:if test="generalOA.target_admin neq null">
- 								<s:textfield name="generalOA.target_admin" 
-									value="%{generalOA.target_admin}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.target.admin.disabled"
-									cssClass="textfield_short"
-									disabled="true">
-								</s:textfield>
+					<s:if test="!isOnlyBusinessService()">
+						<div id="oa_config_publicservice" class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
+							
+							<s:if test="authUser.isAdmin()">
+								<s:select list="generalOA.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{generalOA.target}"
+													name="generalOA.target"
+													onchange="HideAdminTarget();">
+								</s:select>						
 							</s:if>
-<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
-								<s:textfield name="generalOA.targetFriendlyName" 
-									value="%{generalOA.targetFriendlyName}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.target.friendlyname.disabled"
-									cssClass="textfield_long">
-								</s:textfield>
-							</s:if> --%>
- 						</s:else>
-
-
-					</div>
+							<s:else>
+								<s:select list="generalOA.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{generalOA.target}"
+													name="generalOA.target">
+								</s:select>
+							</s:else>
+							
+							<s:checkbox name="subTargetSet" 
+								value="%{subTargetSet}"
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector.checkbox"
+								cssClass="checkbox"
+								onclick="oaTargetSubSector();"
+								id="OAisTargetSubSector">
+							</s:checkbox>
+							
+							<s:textfield name="generalOA.target_subsector" 
+								value="%{generalOA.target_subsector}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector"
+								cssClass="selectfield"
+								id="OAtarget_subsector">
+							</s:textfield>
+							
+							
+	 						<s:if test="authUser.isAdmin()">
+	 							<s:checkbox
+		 							name="generalOA.AdminTarget" 
+									value="%{generalOA.AdminTarget}"
+									cssClass="checkbox"
+	 								onclick="AdminTarget();"
+	 								labelposition="left"
+									key="webpages.oaconfig.general.target.admin.checkbox"
+									id="adminTarget">
+	 							</s:checkbox>
+	 							
+	 							<div id="admin_target_area">
+									<s:textfield name="generalOA.target_admin" 
+										value="%{generalOA.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin"
+										cssClass="textfield_short">
+									</s:textfield>
+									<s:textfield name="generalOA.targetFriendlyName" 
+										value="%{generalOA.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname"
+										cssClass="textfield_long">
+									</s:textfield>
+								</div>
+	 						</s:if>
+	 						<s:else>
+	 							<s:if test="generalOA.target_admin neq null">
+	 								<s:textfield name="generalOA.target_admin" 
+										value="%{generalOA.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin.disabled"
+										cssClass="textfield_short"
+										disabled="true">
+									</s:textfield>
+								</s:if>
+	<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
+									<s:textfield name="generalOA.targetFriendlyName" 
+										value="%{generalOA.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname.disabled"
+										cssClass="textfield_long">
+									</s:textfield>
+								</s:if> --%>
+	 						</s:else>
+						</div>
+					</s:if>
 					
 					<s:if test="authUser.isAdmin()">
 						<div class="oa_config_block">
@@ -396,6 +394,27 @@
 								key="webpages.oaconfig.general.aditional.authblocktext"
 								cssClass="textfield_large">
 							</s:textarea>
+							
+							<s:textfield name="generalOA.bkuSelectionBackGroundColor" 
+								value="%{generalOA.bkuSelectionBackGroundColor}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
+								cssClass="textfield_middle">
+							</s:textfield>
+							
+							<s:checkbox name="generalOA.showMandateLoginButton" 
+								value="%{generalOA.showMandateLoginButton}"
+								labelposition="left"
+								key="webpages.oaconfig.general.BKUSelection.isMandateLoginCheckboxVisible"
+								cssClass="checkbox">
+							</s:checkbox>
+						
+							<s:checkbox name="generalOA.onlyMandateAllowed" 
+								value="%{generalOA.onlyMandateAllowed}"
+								labelposition="left"
+								key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
+								cssClass="checkbox">
+							</s:checkbox>
 						</s:if>
 							
 					</div>