Skip to content

Simplify and expand use of LinkBuilder factory methods #225

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
Apr 14, 2025
Merged

Simplify and expand use of LinkBuilder factory methods #225

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
3 changes: 2 additions & 1 deletion hdrl/src/org/labkey/hdrl/HDRLController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.settings.AdminConsole;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.Path;
import org.labkey.api.util.URLHelper;
Expand Down Expand Up @@ -104,7 +105,7 @@ public ModelAndView getView(Object o, BindException errors)
{
VBox vbox = new VBox();

HtmlView submitView = new HtmlView("New Test Request", HtmlString.of(PageFlowUtil.link("Submit new test request").href(new ActionURL(EditRequestAction.class, getViewContext().getContainer()))));
HtmlView submitView = new HtmlView("New Test Request", HtmlString.of(LinkBuilder.labkeyLink("Submit new test request", new ActionURL(EditRequestAction.class, getViewContext().getContainer()))));
vbox.addView(submitView);

UserSchema schema = QueryService.get().getUserSchema(getUser(), getContainer(), HDRLQuerySchema.NAME);
Expand Down
5 changes: 3 additions & 2 deletions hdrl/src/org/labkey/hdrl/query/HDRLQuerySchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.labkey.api.security.User;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.api.security.permissions.UpdatePermission;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.ViewContext;
Expand Down Expand Up @@ -216,13 +217,13 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
{
FieldKey requestFieldKey = FieldKey.fromParts("RequestId");
ActionURL actionUrl = new ActionURL(HDRLController.EditRequestAction.class, c).addParameter("requestId", (Integer)ctx.get(requestFieldKey));
oldWriter.write(PageFlowUtil.link("Edit").href(actionUrl).toString());
oldWriter.write(LinkBuilder.labkeyLink("Edit", actionUrl).toString());
}
else
{
ActionURL actionUrl = new ActionURL(HDRLController.RequestDetailsAction.class, c);
actionUrl.addParameter("requestId", (Integer) ctx.get("requestId"));
oldWriter.write(PageFlowUtil.link("View").href(actionUrl).toString());
oldWriter.write(LinkBuilder.labkeyLink("View", actionUrl).toString());
}
}
};
Expand Down