Skip to content

Commit

Permalink
added a default value for GP_DASHBOARD_MAX_NUMBER_OF_ENCOUNTERS_TO_SHOW
Browse files Browse the repository at this point in the history
  • Loading branch information
k-joseph committed Jul 19, 2013
1 parent c77d8fd commit a5dd869
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/util/OpenmrsConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,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, "",
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a5dd869

Please sign in to comment.