Skip to content

Migrate to renderGridCellContents(RenderContext, HtmlWriter) #6671

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
labkey-adam merged 1 commit into from
May 19, 2025
Merged

Migrate to renderGridCellContents(RenderContext, HtmlWriter) #6671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
if (null != filename)
{
// Existing value, so tell the user the file name, allow the file to be removed, and a new file uploaded
renderThumbnailAndRemoveLink(out, ctx, filename, input.build().toString());
renderThumbnailAndRemoveLink(out, ctx, filename, input);
}
else
{
Expand All @@ -302,8 +302,7 @@ protected String getRemovalWarningText(String filename)
return "Previous file " + filename + " will be removed.";
}

// TODO: filePicker should be a builder or HtmlString or something sensible like that
private void renderThumbnailAndRemoveLink(HtmlWriter out, RenderContext ctx, String filename, String filePicker)
private void renderThumbnailAndRemoveLink(HtmlWriter out, RenderContext ctx, String filename, InputBuilder<?> filePicker)
{
String divId = GUID.makeGUID();
String linkId = "remove" + divId;
Expand Down
8 changes: 4 additions & 4 deletions api/src/org/labkey/api/data/JavaScriptDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public JavaScriptDisplayColumn(ColumnInfo col, @Nullable Collection<String> depe
}

@Override
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
{
Object o = getValue(ctx);

Expand All @@ -75,13 +75,13 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
if (_onClickExpression != null)
onClick = StringUtils.trim(_onClickExpression.eval(ctx));

renderLink(oldWriter, getFormattedHtml(ctx), onClick, _linkClassName);
renderLink(out, getFormattedHtml(ctx), onClick, _linkClassName);
}
else
oldWriter.write("&nbsp;");
out.write(HtmlString.NBSP);
}

protected void renderLink(Writer out, HtmlString html, @Nullable String onClick, @Nullable String linkClassName)
protected void renderLink(HtmlWriter out, HtmlString html, @Nullable String onClick, @Nullable String linkClassName)
{
LinkBuilder builder = new LinkBuilder(html)
.href("#")
Expand Down
7 changes: 6 additions & 1 deletion api/src/org/labkey/api/view/PopupMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ public void render(RenderContext ctx, Writer out) throws IOException

public void render(Writer out) throws IOException
{
renderMenuButton(null, HtmlWriter.of(out), false, null);
render(HtmlWriter.of(out));
}

public void render(HtmlWriter out)
{
renderMenuButton(null, out, false, null);
}

public void renderMenuButton(@Nullable RenderContext ctx, HtmlWriter out, boolean requiresSelection, @Nullable ActionButton button)
Expand Down