diff options
Diffstat (limited to 'id')
2 files changed, 29 insertions, 26 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index 725a2eded..a658c3f34 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -175,19 +175,16 @@ public class EditGeneralConfigAction extends BasicAction { } } - - - - String error = saveFormToDatabase(); - - session.setAttribute(Constants.SESSION_SLTRANSFORMATION, null); - + + String error = saveFormToDatabase(); if (error != null) { log.warn("General MOA-ID config can not be stored in Database"); addActionError(error); - return Constants.STRUTS_SUCCESS; + return Constants.STRUTS_ERROR_VALIDATION; } + session.setAttribute(Constants.SESSION_SLTRANSFORMATION, null); + } else { addActionError(LanguageHelper.getErrorString("errors.notallowed", request)); return Constants.STRUTS_NOTALLOWED; @@ -478,12 +475,18 @@ public class EditGeneralConfigAction extends BasicAction { if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKUHandy())) dbbkus.setHandyBKU(moaconfig.getDefaultBKUHandy()); + else + dbbkus.setHandyBKU(new String()); if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKUOnline())) dbbkus.setOnlineBKU(moaconfig.getDefaultBKUOnline()); + else + dbbkus.setOnlineBKU(new String()); if (MiscUtil.isNotEmpty(moaconfig.getDefaultBKULocal())) dbbkus.setLocalBKU(moaconfig.getDefaultBKULocal()); + else + dbbkus.setLocalBKU(new String()); ChainingModes dbchainingmodes = dbconfig.getChainingModes(); if (dbchainingmodes == null) { diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java index ed02f8186..0e9411042 100644 --- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java +++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java @@ -191,12 +191,12 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme "Default BKUs - Handy", LanguageHelper.getErrorString("validation.general.bku.handy.valid"))); } - } else { - log.info("Empty Handy-BKU URL"); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_HANDY, - "Default BKUs - Handy", - LanguageHelper.getErrorString("validation.general.bku.handy.empty"))); +// } else { +// log.info("Empty Handy-BKU URL"); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_HANDY, +// "Default BKUs - Handy", +// LanguageHelper.getErrorString("validation.general.bku.handy.empty"))); } check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_LOCAL, getKeyPrefix())); @@ -208,12 +208,12 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme "Default BKUs - Local", LanguageHelper.getErrorString("validation.general.bku.local.valid"))); } - } else { - log.info("Empty Online-BKU URL"); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_LOCAL, - "Default BKUs - Local", - LanguageHelper.getErrorString("validation.general.bku.local.empty"))); +// } else { +// log.info("Empty Online-BKU URL"); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_LOCAL, +// "Default BKUs - Local", +// LanguageHelper.getErrorString("validation.general.bku.local.empty"))); } @@ -226,12 +226,12 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme "Default BKUs - Online", LanguageHelper.getErrorString("validation.general.bku.online.valid"))); } - } else { - log.info("Empty Online-BKU URL"); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_ONLINE, - "Default BKUs - Online", - LanguageHelper.getErrorString("validation.general.bku.online.empty"))); +// } else { +// log.info("Empty Online-BKU URL"); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_ONLINE, +// "Default BKUs - Online", +// LanguageHelper.getErrorString("validation.general.bku.online.empty"))); } |