Skip to content

Manually parse viewName parameter. #7574

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

Draft
labkey-klum wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+21 −6
Draft

Manually parse viewName parameter. #7574

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
27 changes: 21 additions & 6 deletions query/src/org/labkey/query/controllers/GetQueryDetailsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONObject;
import org.labkey.api.action.Action;
import org.labkey.api.action.ActionType;
import org.labkey.api.action.ApiResponse;
import org.labkey.api.action.ApiSimpleResponse;
import org.labkey.api.action.BaseViewAction;
import org.labkey.api.action.HasBindParameters;
import org.labkey.api.action.ReadOnlyApiAction;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.collections.CaseInsensitiveHashSet;
Expand Down Expand Up @@ -63,6 +66,7 @@
import org.labkey.query.CustomViewUtil;
import org.labkey.query.QueryDefinitionImpl;
import org.labkey.query.persist.QueryDef;
import org.springframework.beans.PropertyValues;
import org.springframework.validation.BindException;

import java.util.ArrayList;
Expand Down Expand Up @@ -460,7 +464,7 @@ protected List<Map<String,Object>> getDefViewColProps(QueryView view)
return colProps;
}

public static class Form
public static class Form implements HasBindParameters
{
private String _queryName;
private String _schemaName;
Expand Down Expand Up @@ -496,11 +500,6 @@ public String[] getViewName()
return _viewName;
}

public void setViewName(String[] viewName)
{
_viewName = viewName;
}

public String getFk()
{
return _fk;
Expand Down Expand Up @@ -550,5 +549,21 @@ public void setIncludeTriggers(boolean includeTriggers)
{
_includeTriggers = includeTriggers;
}

@Override
public @NotNull BindException bindParameters(PropertyValues params)
{
// GitHub Issue #936 : manually bind the viewName parameter
var viewName = params.getPropertyValue("viewName");
if (viewName != null)
{
var value = viewName.getValue();
if (value instanceof String[] strs)
_viewName = strs;
else if (value instanceof String str)
_viewName = new String[] { str };
}
return BaseViewAction.springBindParameters(this, "form", params);
}
}
}
Loading