From 1bec135f96f6231eafb9cef28bbdb1a018d7d967 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 May 2014 11:07:05 +0200
Subject: fix 2.0.0 merge problem

---
 .../configuration/struts/action/EditOAAction.java  | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'id')

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()));
-- 
cgit v1.2.3