resolve 3.3.4 #195
Merged
resolve 3.3.4 #195
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
1079
to
1086
| textToDisplay = omsgs.viewingResultsFor.replace("_SEARCH_TEXT_", "'<b>"+sanitizeHtml(searchText)+"</b>'"); | ||
| if($j.trim(searchText) == '') | ||
| textToDisplay = omsgs.viewingAll; | ||
|
|
||
| $j('#pageInfo').html(sanitizeHtml(textToDisplay)); | ||
|
|
||
| if($j('#pageInfo').css("visibility") != 'visible') | ||
| $j('#pageInfo').css("visibility", "visible"); |
There was a problem hiding this comment.
The indentation is off. Could you please adjust?
There was a problem hiding this comment.
@rkorytkowski resolved
| @@ -1075,14 +1075,16 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler, | |||
| return Math.ceil(this._table.fnSettings()._iDisplayStart / this._table.fnSettings()._iDisplayLength) + 1; | |||
| }, | |||
| _updatePageInfo: function(searchText) { | |||
| textToDisplay = omsgs.viewingResultsFor.replace("_SEARCH_TEXT_", "'<b>"+searchText+"</b>'"); | |||
| if ((/^[a-zA-Z0-9_\-]+$/.test(searchText))) { | |||
There was a problem hiding this comment.
Isn't it enough to sanitizeHtml? Why this "if"?
There was a problem hiding this comment.
@rkorytkowski It wasn't when I tested. I still found the same issue. Secondly Its better handled at the generation point for the HTML than at the use level of the OpenmrsSearch function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.