Merge pull request #790 from CalebSLane/develop

fixes for haiti
openelisglobal · Dec 13, 2018 · bd758f0 · bd758f0
2 parents a32151d + 8c86acf
commit bd758f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/WebContent/pages/datasubmission/dataSubmissionView.jsp b/app/WebContent/pages/datasubmission/dataSubmissionView.jsp
@@ -17,8 +17,8 @@
 %>
 
 <bean:define id="formName" value='<%=(String) request.getAttribute(IActionConstants.FORM_NAME)%>' />
-<bean:define id="month" name="<%=formName%>" property="month"/>
-<bean:define id="year" name="<%=formName%>" property="year" />
+<bean:define id="month" name="<%=formName%>" property="month" type="java.lang.Integer"/>
+<bean:define id="year" name="<%=formName%>" property="year" type="java.lang.Integer"/>
 
 
 <script type="text/javascript">
@@ -65,7 +65,7 @@ function showsubmitting() {
 
 function confirmSentWarning() {
 	var sentIndicators = [];
-	var message = "<bean:message key="datasubmission.warning.sent" arg0="<%=DateUtil.getMonthFromInt((int) month, false)%>" arg1="<%=Integer.toString((int) year)%>"/>";
+	var message = "<bean:message key='datasubmission.warning.sent' arg0='<%=DateUtil.getMonthFromInt(month, false)%>' arg1='<%=Integer.toString(year)%>'/>";
 	$jq("span.<%=DataIndicator.SENT%>").each(function() {
 		sentIndicators.push(this.id);
 	});

diff --git a/app/src/us/mn/state/health/lims/localization/valueholder/Localization.hbm.xml b/app/src/us/mn/state/health/lims/localization/valueholder/Localization.hbm.xml
@@ -28,8 +28,8 @@
         </id>
 
         <version name="lastupdated" column="LASTUPDATED" type="timestamp" access="field"/>
-        <property name="description" column="description" type="java.lang.String" />
-        <property name="english" column="english" type="java.lang.String" />
-        <property name="french" column="french" type="java.lang.String" />
+        <property name="description" column="description" type="java.lang.String" lazy="false"/>
+        <property name="english" column="english" type="java.lang.String" lazy="false"/>
+        <property name="french" column="french" type="java.lang.String" lazy="false"/>
     </class>
 </hibernate-mapping>