diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-05 11:07:05 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-05 11:07:05 +0200 |
commit | 1bec135f96f6231eafb9cef28bbdb1a018d7d967 (patch) | |
tree | 2ab13a4c85c93e33f3c0362e1ca70f06f559f91d /id/ConfigWebTool | |
parent | 2148e57eb243fcb7089356a64be057a92bb1baaa (diff) | |
download | moa-id-spss-1bec135f96f6231eafb9cef28bbdb1a018d7d967.tar.gz moa-id-spss-1bec135f96f6231eafb9cef28bbdb1a018d7d967.tar.bz2 moa-id-spss-1bec135f96f6231eafb9cef28bbdb1a018d7d967.zip |
fix 2.0.0 merge problem
Diffstat (limited to 'id/ConfigWebTool')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index 452c5580d..d2a2cfdf7 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -864,12 +864,25 @@ public class EditOAAction extends BasicAction { } Mandates mandates = new Mandates(); - if (generalOA.isUseMandates()) { - mandates.setProfiles(generalOA.getMandateProfiles()); - - } else { - mandates.setProfiles(new String()); - } + if (generalOA.isUseMandates()) { + if (MiscUtil.isNotEmpty(generalOA.getMandateProfiles())) { + List<MandatesProfileNameItem> profileList = new ArrayList<MandatesProfileNameItem>(); + String[] inputList = generalOA.getMandateProfiles().split(","); + for (int i=0; i<inputList.length; i++) { + + MandatesProfileNameItem item = new MandatesProfileNameItem(); + item.setItem(inputList[i]); + profileList.add(item); + } + mandates.setProfileNameItems(profileList ); + mandates.setProfiles(null); + } + + + } else { + mandates.setProfiles(null); + mandates.setProfileNameItems(null); + } authoa.setMandates(mandates); bkuselectioncustom.setMandateLoginButton(MiscUtil.isNotEmpty(generalOA.getMandateProfiles())); |