Merge pull request #372 from k-joseph/TRUNK-2449

TRUNK-2449
openmrs · Jul 30, 2013 · 9cddcf7 · 9cddcf7
2 parents 67b5799 + a5dd869
commit 9cddcf7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/util/OpenmrsConstants.java b/api/src/main/java/org/openmrs/util/OpenmrsConstants.java
@@ -1484,7 +1484,7 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
 		props
 		        .add(new GlobalProperty(
 		                GP_DASHBOARD_MAX_NUMBER_OF_ENCOUNTERS_TO_SHOW,
-		                "",
+		                "3",
 		                "An integer which, if specified, would determine the maximum number of encounters to display on the encounter tab of the patient dashboard."));
 
 		props.add(new GlobalProperty(GP_VISIT_TYPES_TO_AUTO_CLOSE, "",

diff --git a/webapp/src/main/webapp/WEB-INF/messages.properties b/webapp/src/main/webapp/WEB-INF/messages.properties
@@ -931,7 +931,7 @@ Encounter.enterer=Enterer
 Encounter.id=Encounter Id
 Encounter.no.previous=No Previous Encounters
 Encounter.last.encounters=Last Three Encounters
-Encounter.last.definedEncounters=Last {0} Encounters
+Encounter.last.definedNumberOfEncounters=Last {0} Encounters
 Encounter.noFormDefined=(No form defined)
 Encounter.page=Page {0}
 Encounter.searchPhraseCannotBeNull=Search phrase cannot be null

diff --git a/webapp/src/main/webapp/WEB-INF/view/portlets/personFormEntry.jsp b/webapp/src/main/webapp/WEB-INF/view/portlets/personFormEntry.jsp
@@ -21,7 +21,7 @@ Parameters:
 <c:if test="${model.showDefinedNumberOfEncounters}">  <%-- showDefinedNumberOfEncounters shows the given number of encounters entered in the dashboard.encounters.maximumNumberToShow global property value --%>
 	<openmrs:hasPrivilege privilege="View Encounters">
 		<openmrs:globalProperty var="maxEncs" key="dashboard.encounters.maximumNumberToShow" defaultValue="" />
-		<openmrs:portlet url="patientEncounters" id="patientDashboardEncounters" patientId="${patient.patientId}" parameters="num=${maxEncs}|title=Encounter.last.definedEncounters|formEntryReturnUrl=${pageContext.request.contextPath}/patientDashboard.form" />
+		<openmrs:portlet url="patientEncounters" id="patientDashboardEncounters" patientId="${patient.patientId}" parameters="num=${maxEncs}|title=Encounter.last.definedNumberOfEncounters|formEntryReturnUrl=${pageContext.request.contextPath}/patientDashboard.form" />
 		<br/>
 	</openmrs:hasPrivilege>
 </c:if>