Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions LDK/src/org/labkey/ldk/LDKController.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

public class LDKController extends SpringActionController
{
Expand Down Expand Up @@ -439,9 +440,9 @@ public ModelAndView getView(Object form, BindException errors) throws Exception
List<String> messages = service.validateContainerScopedTables(false);

String sb = "This page is designed to inspect all registered container scoped tables and report any tables with duplicate keys in the same container. This should be enforced by the user schema; however, direct DB inserts will bypass this check.<p>" +
StringUtils.join(messages, "<br>");
messages.stream().map(PageFlowUtil::filter).collect(Collectors.joining("<br>"));

return new HtmlView(HtmlString.of(sb));
return new HtmlView(HtmlString.unsafe(sb));
}

@Override
Expand Down Expand Up @@ -912,7 +913,7 @@ public ModelAndView getView(Object form, BindException errors) throws Exception
}
catch (URISyntaxException e)
{
return new HtmlView(HtmlString.unsafe("Invalid redirect URL set: " + urlString));
return new HtmlView(HtmlString.of("Invalid redirect URL set: " + urlString));
}
}
}
Expand Down