ESPD-124 #16 bugfix for empty list of representatives

ESPD · Aug 30, 2016 · f8109a0 · f8109a0
1 parent 0ade3e5
commit f8109a0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/controller/EspdController.java
@@ -32,8 +32,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -89,11 +87,7 @@ class EspdController {
 
     @ModelAttribute("espd")
     public EspdDocument newDocument() {
-    	EspdDocument espd = new EspdDocument();
-    	espd.setEconomicOperator(new EconomicOperatorImpl());
-    	espd.getEconomicOperator().setRepresentatives(new ArrayList<EconomicOperatorRepresentative>());
-    	espd.getEconomicOperator().getRepresentatives().add(new EconomicOperatorRepresentative());
-    	return espd;
+    	return new EspdDocument();
     }
 
     @RequestMapping("/")

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedure.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedure.jsp
@@ -1,3 +1,9 @@
+<%@page import="java.util.ArrayList"%>
+<%@page import="eu.europa.ec.grow.espd.domain.EconomicOperatorImpl"%>
+<%@page import="eu.europa.ec.grow.espd.domain.EconomicOperatorRepresentative"%>
+<%@page import="org.springframework.util.CollectionUtils"%>
+<%@page import="eu.europa.ec.grow.espd.domain.EspdDocument"%>
+
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -70,6 +76,20 @@
         	<tiles:putAttribute name="flow" value="${flow}"/>
             <tiles:putAttribute name="procedure" value="true"/>
         </tiles:insertDefinition>
+
+        <%
+        	// Add at least one EconomicOperatorRepresentative to be sure user will see it in form
+        	EspdDocument espd = (EspdDocument)request.getAttribute("espd");
+        	if (espd != null) { 
+        		if (espd.getEconomicOperator() == null) {
+        			espd.setEconomicOperator(new EconomicOperatorImpl());
+        		}
+	        	if (CollectionUtils.isEmpty(espd.getEconomicOperator().getRepresentatives())) {
+        			espd.getEconomicOperator().setRepresentatives(new ArrayList<EconomicOperatorRepresentative>());
+        			espd.getEconomicOperator().getRepresentatives().add(new EconomicOperatorRepresentative());
+	        	}
+        	}
+        %>
 
 		<%@ include file="/WEB-INF/views/wizard/procedureForm.jsp" %>