Skip to content
Open
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions api/src/org/labkey/api/action/QueryViewAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.labkey.api.action;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.ColumnHeaderType;
import org.labkey.api.data.ExcelWriter;
Expand Down Expand Up @@ -135,7 +136,9 @@ protected ModelAndView getHtmlView(Form form, BindException errors) throws Excep
/**
* Correctly configures the QueryView to use the QueryViewAction for export purposes
* @param dataRegion null as a convenience when only a single QueryView is being used
* @throws NotFoundException if passed a dataRegion name that doesn't exist
*/
@NotNull
protected final ViewType createInitializedQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception
{
ViewType result = createQueryView(form, errors, forExport, dataRegion);
Expand Down Expand Up @@ -164,6 +167,7 @@ protected final ViewType createInitializedQueryView(Form form, BindException err
* Create the specially configured query view.
* @param dataRegion null as a convenience when only a single QueryView is being used
*/
@Nullable
protected abstract ViewType createQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception;

public static class QueryExportForm extends QueryForm
Expand Down
4 changes: 3 additions & 1 deletion api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.labkey.api.util.ContainerContext;
import org.labkey.api.util.DOM;
import org.labkey.api.util.GUID;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.JavaScriptFragment;
import org.labkey.api.util.StringExpression;
import org.labkey.api.view.ActionURL;
Expand All @@ -38,6 +39,7 @@

import static org.labkey.api.util.DOM.SPAN;
import static org.labkey.api.util.DOM.id;
import static org.labkey.api.util.DOM.Attribute.style;

/**
* Uses LABKEY.Ext.CalloutTip to provide additional details, summoned via AJAX
Expand Down Expand Up @@ -106,7 +108,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
props.put("target", divId);

SPAN(
id(divId),
id(divId).at(style, "display:inline-flex;flex-wrap:nowrap"),
(DOM.Renderable) ret -> {
super.renderGridCellContents(ctx, out);
return ret;
Expand Down