Skip to content
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

Jump to bottom

Sanitize caption used in Grid header #11645

Merged
merged 2 commits into from
Jul 2, 2019
Merged

Sanitize caption used in Grid header #11645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ba10a
Sanitize caption used in Grid header
TatuLund Jul 1, 2019
f9edac5
Merge branch '7.7' into cherry11644
TatuLund Jul 1, 2019
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
2 changes: 2 additions & 0 deletions server/src/main/java/com/vaadin/ui/Grid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import org.jsoup.Jsoup;
import org.jsoup.nodes.Attributes;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
Expand Down Expand Up @@ -3424,6 +3425,7 @@ public Column setHeaderCaption(String caption)
if (caption == null) {
caption = ""; // Render null as empty
}
caption = Jsoup.parse(caption).text();
state.headerCaption = caption;

HeaderRow row = grid.getHeader().getDefaultRow();
Expand Down