diff --git a/api/src/org/labkey/api/workflow/Job.java b/api/src/org/labkey/api/workflow/Job.java index 90c2b5d5e05..d0abfa9430b 100644 --- a/api/src/org/labkey/api/workflow/Job.java +++ b/api/src/org/labkey/api/workflow/Job.java @@ -27,6 +27,7 @@ import org.labkey.api.exp.Lsid; import org.labkey.api.exp.ObjectProperty; import org.labkey.api.exp.PropertyDescriptor; +import org.labkey.api.exp.api.ExpData; import org.labkey.api.exp.api.ExpMaterial; import org.labkey.api.query.ValidationException; import org.labkey.api.security.Group; @@ -315,6 +316,12 @@ public void setAttachments(List attachments) @JsonIgnore public abstract @NotNull List getSampleNames(); + @JsonIgnore + public abstract @NotNull List getSources(); + + @JsonIgnore + public abstract @NotNull List getSourceNames(); + public void setEntities(List entities) { _entities = entities; diff --git a/api/src/org/labkey/api/workflow/WorkEntity.java b/api/src/org/labkey/api/workflow/WorkEntity.java index 8898a37c06b..cf878e701a0 100644 --- a/api/src/org/labkey/api/workflow/WorkEntity.java +++ b/api/src/org/labkey/api/workflow/WorkEntity.java @@ -90,7 +90,6 @@ public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType _actionId = actionId; } - public Long getRowId() { return _rowId; diff --git a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java index d5179234b47..93211baf5d7 100644 --- a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java +++ b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java @@ -8133,7 +8133,7 @@ public void validateForm(CrossFolderSelectionForm form, Errors errors) if (form.getDataRegionSelectionKey() == null && form.getRowIds() == null) errors.reject(ERROR_REQUIRED, "You must provide either a set of rowIds or a dataRegionSelectionKey."); if (!"samples".equalsIgnoreCase(form.getDataType()) && !"exp.data".equalsIgnoreCase(form.getDataType())&& !"assay".equalsIgnoreCase(form.getDataType())) - errors.reject(ERROR_REQUIRED, "Data type (sample, data or assayrun) must be specified."); + errors.reject(ERROR_REQUIRED, "Data type (samples, exp.data or assay) must be specified."); } @Override