Skip to content

Added WebUtil.escapeHTML function to ProviderListItem #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isears merged 2 commits into from
May 11, 2021
Merged

Added WebUtil.escapeHTML function to ProviderListItem #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db97835
Added WebUtil.escapeHTML function to ProviderListItem
Parth59 Apr 8, 2021
25ad609
Merge branch 'master' into EMPT_64
isears May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion omod/src/main/java/org/openmrs/web/dwr/ProviderListItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
$j('#openmrsSearchTable_paginate').show();
}

this._updatePageInfo($j('<div/>').text(searchText).html());
this._updatePageInfo(searchText);
if(matchCount == 0){
if($j('#openmrsSearchTable_info').is(":visible"))
$j('#openmrsSearchTable_info').hide();
Expand All @@ -841,7 +841,7 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
var data = rowData[c.fieldName];
if(data == null)
data = " ";
return $j('<div/>').text(data).html();
return data;
});

//include the attributes
Expand Down