Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 469bda52dd93
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66031024f10d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 11, 2014

  1. TRUNK-2147: Changed html input text to spring:message

    @madawas
    madawas committed Jan 11, 2014
    Copy the full SHA
    2d42268 View commit details

Commits on Jan 14, 2014

  1. TRUNK-2147: Fixed property name truncate error

    @madawas
    madawas committed Jan 14, 2014
    Copy the full SHA
    a2f9ed3 View commit details

Commits on Jan 15, 2014

  1. TRUNK-2147: Svae message fixed

    @madawas
    madawas committed Jan 15, 2014
    Copy the full SHA
    aebca23 View commit details

  2. Merge pull request #520 from madawa-rc/TRUNK-2147 

    TRUNK-2147: Double quote truncate error
    @dkayiwa
    dkayiwa committed Jan 15, 2014
    Copy the full SHA
    6603102 View commit details
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/messages.properties
View file
Original file line number Diff line number Diff line change
@@ -2073,7 +2073,7 @@ Scheduler.taskForm.class=Schedulable Class
Scheduler.taskForm.edit=Edit
Scheduler.taskForm.schedules=Schedule
Scheduler.taskForm.save=Save
Scheduler.taskForm.saved=Task {0} has been saved<br/>
Scheduler.taskForm.saved=Task {0} has been saved
Scheduler.list.status=Status
Scheduler.list.taskClass=Task / Class
Scheduler.list.schedule=Schedule
4 changes: 2 additions & 2 deletions webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -307,8 +307,8 @@ window.onload = init;
</tr>
<c:forEach var="property" items="${task.properties}">
<tr>
<td><input type="text" name="propertyName" size="20" value="${property.key}" /></td>
<td><input type="text" name="propertyValue" size="30" value="${property.value}" /></td>
<td><input type="text" name="propertyName" size="20" value="<spring:message text="${property.key}" htmlEscape="true"/>" /></td>
<td><input type="text" name="propertyValue" size="30" value="<spring:message text="${ property.value }" htmlEscape="true"/>" /></td>
<td><input type="button" class="closeButton" onclick="removeProperty(this)" value="<openmrs:message code="Scheduler.propertyForm.remove"/>"></td>
</tr>
</c:forEach>
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
</script>

<h2><openmrs:message code="Scheduler.header" /></h2>
<h2><openmrs:message code="Scheduler.header" /></h2>

<a href="scheduler.form"><openmrs:message code="Scheduler.taskList.add" /></a> |
<a href="scheduler.list"><openmrs:message code="Scheduler.taskList.refresh" /></a>