Skip to content

Fix link reports#6876

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 3 commits into from
Jul 25, 2025
Merged

Fix link reports #6876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ca0583
Fix link reports
labkey-adam Jul 24, 2025
ee5e3b3
Use standard error rendering
labkey-adam Jul 24, 2025
98786e8
Deprecate redirect(String)
labkey-adam Jul 24, 2025
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
1 change: 1 addition & 0 deletions api/src/org/labkey/api/view/HttpView.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -603,6 +603,7 @@ public static HttpView<?> redirect(ActionURL url)
return redirect(url.getLocalURIString());
}

@Deprecated(forRemoval = true) // Use ActionURL or URLHelper variant instead. TODO: Remove
public static HttpView<?> redirect(String url)
{
throw new RedirectException(url);
Expand Down
10 changes: 8 additions & 2 deletions query/src/org/labkey/query/reports/ReportsController.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,7 @@
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NotFoundException;
import org.labkey.api.view.Portal;
import org.labkey.api.view.RedirectException;
import org.labkey.api.view.UnauthorizedException;
import org.labkey.api.view.VBox;
import org.labkey.api.view.ViewBackgroundInfo;
Expand DownExpand Up@@ -199,7 +200,6 @@
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.labkey.api.reports.model.ViewCategoryManager.UNCATEGORIZED_ROWID;
import static org.labkey.api.util.DOM.DIV;
import static org.labkey.api.util.DOM.SPAN;
import static org.labkey.api.util.DOM.cl;

public class ReportsController extends SpringActionController
Expand DownExpand Up@@ -1017,9 +1017,15 @@ public ModelAndView getView(ReportDesignBean<?> form, BindException errors) thro
{
reportView = _report.getRunReportView(getViewContext());
}
catch (RedirectException re)
{
// Link reports throw RedirectException... pass it on
throw re;
}
catch (RuntimeException e)
{
return new HtmlView(SPAN(cl("labkey-error"), e.getMessage(), ". Unable to create report."));
String message = Objects.requireNonNullElse(e.getMessage(), e.getClass().getSimpleName()) + ". Unable to create report.";
return HtmlView.err(message);
}

if (!isPrint() && DiscussionService.get() != null)
Expand Down