From db97835cc5f09922a6334e086f329f2838d1b746 Mon Sep 17 00:00:00 2001 From: Parth59 Date: Wed, 7 Apr 2021 20:50:48 -0700 Subject: [PATCH] Added WebUtil.escapeHTML function to ProviderListItem Solved Compatibality issues --- omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java | 3 ++- .../webapp/resources/scripts/jquery-ui/js/openmrsSearch.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java b/omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java index e26bc837..671fcec5 100644 --- a/omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java +++ b/omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java @@ -11,6 +11,7 @@ import org.openmrs.Person; import org.openmrs.Provider; +import org.openmrs.web.WebUtil; /** * A mini/simplified provider object. Used as the return object from DWR methods to allow javascript @@ -37,7 +38,7 @@ public ProviderListItem(Provider provider) { } else { displayName = provider.getName(); } - identifier = provider.getIdentifier(); + identifier = WebUtil.escapeHTML(provider.getIdentifier()); providerId = provider.getProviderId(); retired = provider.isRetired(); } diff --git a/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js b/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js index 915baa46..4dbe8b2e 100644 --- a/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js +++ b/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js @@ -823,7 +823,7 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler, $j('#openmrsSearchTable_paginate').show(); } - this._updatePageInfo($j('
').text(searchText).html()); + this._updatePageInfo(searchText); if(matchCount == 0){ if($j('#openmrsSearchTable_info').is(":visible")) $j('#openmrsSearchTable_info').hide(); @@ -841,7 +841,7 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler, var data = rowData[c.fieldName]; if(data == null) data = " "; - return $j('
').text(data).html(); + return data; }); //include the attributes