Skip to content

Commit f07e586

Browse files
committed
Issue: 53771, 52627 and 53846
1 parent 7fdf48c commit f07e586

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ public void validateOptions(Container container, User user, SampleTypeDomainKind
488488
ExpSampleType sampleType = options.getRowId() >= 0 ? ss.getSampleType(options.getRowId()) : null;
489489
Domain stDomain = sampleType != null ? sampleType.getDomain() : null;
490490
Set<String> reservedNames = new CaseInsensitiveHashSet(this.getReservedPropertyNames(stDomain, user));
491+
reservedNames.add("Parent"); // Issue 52627: Don't allow "Parent" to be used for lineage parent import alias
491492
Set<String> existingAliases = new CaseInsensitiveHashSet();
492493

493494
try

experiment/src/org/labkey/experiment/PropertyQueryChangeListener.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ private void updateLookupSchema(String newValue, String oldSchema, Container con
6363
@Override
6464
public void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, @NotNull QueryProperty property, @NotNull Collection<QueryPropertyChange> changes)
6565
{
66+
if (!property.equals(QueryProperty.SchemaName) && !property.equals(QueryProperty.Name)) // Issue 53846
67+
return;
68+
6669
// is there any other schema change other than assay renaming?
6770
boolean isSchemaChange = schema.toString().toLowerCase().startsWith("assay.general.");
6871

0 commit comments

Comments
 (0)