Skip to content

Fix field error handling in BeanViewForm #7799

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
Jun 29, 2026
Merged

Fix field error handling in BeanViewForm #7799

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
10 changes: 10 additions & 0 deletions api/src/org/labkey/api/data/BeanViewForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
import org.labkey.api.action.BaseViewAction.BeanUtilsPropertyBindingResult;
import org.labkey.api.action.HasBindParameters;
import org.labkey.api.action.NullSafeBindException;
import org.springframework.validation.BindException;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -86,6 +89,13 @@ public void setBean(K bean)
setTypedValues(factory.toMap(bean, null), false);
}

@Override
public BindException createErrors()
{
// Teaches Spring to resolve field names via string lookups instead of getters. e.g., errors.rejectValue().
return new NullSafeBindException(new BeanUtilsPropertyBindingResult(this, "form"));
}

@Override
public Map<String, Object> getValuesToBind()
{
Expand Down
9 changes: 7 additions & 2 deletions api/src/org/labkey/api/data/TableViewForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.labkey.api.action.NullSafeBindException;
import org.labkey.api.action.SpringActionController;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.ontology.Quantity;
import org.labkey.api.query.FieldKey;
import org.labkey.api.security.permissions.DeletePermission;
import org.labkey.api.security.permissions.InsertPermission;
Expand Down Expand Up @@ -897,10 +896,16 @@ else if (orig.getName().startsWith(ARRAY_MARKER) && orig.getValue()!=null)
setValueToBind(pv.getName(), pv.getValue());
}

BindException errors = new NullSafeBindException(this, "form");
BindException errors = createErrors();
validateBind(errors);
return errors;
}

// Construct and return a BindException that's appropriate for this form
public BindException createErrors()
{
return new NullSafeBindException(this, "form");
}
}


3 changes: 1 addition & 2 deletions api/src/org/labkey/api/query/UserSchemaAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import org.jetbrains.annotations.Nullable;
import org.labkey.api.action.FormViewAction;
import org.labkey.api.action.NullSafeBindException;
import org.labkey.api.action.SpringActionController;
import org.labkey.api.attachments.SpringAttachmentFile;
import org.labkey.api.audit.TransactionAuditProvider;
Expand Down Expand Up @@ -79,7 +78,7 @@ public BindException bindParameters(PropertyValues m) throws Exception
QueryUpdateForm command = new QueryUpdateForm(_table, getViewContext(), null);
if (command.isBulkUpdate())
command.setValidateRequired(false);
BindException errors = new NullSafeBindException(new BeanUtilsPropertyBindingResult(command, "form"));
BindException errors = command.createErrors();
command.validateBind(errors);
return errors;
}
Expand Down
3 changes: 1 addition & 2 deletions study/src/org/labkey/study/pipeline/FileAnalysisDatasetTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.labkey.study.pipeline;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.action.BaseViewAction;
import org.labkey.api.action.NullSafeBindException;
import org.labkey.api.admin.PipelineJobLoggerGetter;
import org.labkey.api.assay.transform.DataTransformService;
Expand Down Expand Up @@ -114,7 +113,7 @@ else if (params.containsKey(DataTransformService.ORIGINAL_SOURCE_PATH))
for (String error : readerErrors)
_ctx.getLogger().error(error);

BindException errors = new NullSafeBindException(new BaseViewAction.BeanUtilsPropertyBindingResult(this, "pipeline"));
BindException errors = new NullSafeBindException(this, "pipeline");
boolean allowDomainUpdates = true;
if (_ctx.getProperties().containsKey(StudyImportContext.ALLOW_DOMAIN_UPDATES))
allowDomainUpdates = Boolean.parseBoolean(_ctx.getProperties().get(StudyImportContext.ALLOW_DOMAIN_UPDATES));
Expand Down