Merge pull request #29 in ESPD/espd from develop to release-2017.01

* commit '1752d70b535c1c9349e267fd824938a08c75e4c7': #132 fix null pointer error for WebLogic
ESPD · Jan 27, 2017 · dad04ad · dad04ad
2 parents d519487 + 1752d70
commit dad04ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp
@@ -1,5 +1,3 @@
-<%@page import="eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion"%>
-
 <%@ 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" %>
@@ -37,6 +35,7 @@
 <c:if test="${espd.extendCe}">
 	<%request.setAttribute("exclusionCA", eu.europa.ec.grow.espd.xml.CriteriaTemplates.exclusionCE);%>
 </c:if>
+<%request.setAttribute("nationalExclusionGrounds", eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS);%>
 
 <tiles:importAttribute name="flow"/>
 
@@ -80,7 +79,7 @@
 	                    <tiles:putAttribute name="title_code" value="crit_eu_title_purely_national"/>
 	                    <tiles:putAttribute name="description_code" value="crit_eu_text_purely_national"/>
 	                    <tiles:putAttribute name="hasCriterion" value="true"/>
-	                    <tiles:putAttribute name="criterion" value="${ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS}"/>
+	                    <tiles:putAttribute name="criterion" value="${nationalExclusionGrounds}"/>
 	                </tiles:insertDefinition>
             </div>
         </div>

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp
@@ -1,5 +1,3 @@
-<%@page import="eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion"%>
-
 <%@ 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" %>
@@ -32,6 +30,7 @@
   --%>
 
 <%request.setAttribute("exclusionEO", eu.europa.ec.grow.espd.xml.CriteriaTemplates.exclusionEO);%>
+<%request.setAttribute("nationalExclusionGrounds", eu.europa.ec.grow.espd.domain.enums.criteria.ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS);%>
 
 <tiles:importAttribute name="flow"/>
 
@@ -98,7 +97,7 @@
                             <tiles:putAttribute name="description_code" value="crit_eu_text_purely_national"/>
                             <tiles:putAttribute name="selfCleaning" value="true"/>
                             <tiles:putAttribute name="hasCriterion" value="true"/>
-                            <tiles:putAttribute name="criterion" value="${ExclusionCriterion.NATIONAL_EXCLUSION_GROUNDS}"/>
+                            <tiles:putAttribute name="criterion" value="${nationalExclusionGrounds}"/>
                         </tiles:insertDefinition>
                     </div>
                 </div>