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: d31a7df1fd63
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: 9a52788bfd42
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 18, 2013

  1. fixes pasting error from a prev. commit 

    thanks for review! :-)
    Marv Cool committed Nov 18, 2013
    Copy the full SHA
    d1416d2 View commit details

  2. Merge pull request #455 from openmrs-codejam-hamburg/TRUNK-3940-XSS-i… 

    …n-concepts

fixes pasting error from a prev. commit
    @dkayiwa
    dkayiwa committed Nov 18, 2013
    Copy the full SHA
    9a52788 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@
<tr>
<th></th>
<td>
<i><openmrs:message htmlEscape="false" code="Role.inheritedRoles.description.java.util.Date.warning"/></i>
<i><openmrs:message htmlEscape="false" code="Role.inheritedRoles.description"/></i>
<br/>
<c:if test="${role.role == superuser}"><openmrs:message code="Role.superuser.hasAllRolesAndPrivileges"/></c:if>
<c:if test="${role.role != superuser}">