Skip to content

Commit

Permalink
Move isProvisioned to abstract class
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-martyp committed Jan 6, 2025
1 parent 06ad4f1 commit 01e1deb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.labkey.study.model;

import org.labkey.api.data.Container;
import org.labkey.api.exp.property.Domain;
import org.labkey.api.security.User;
import org.labkey.api.study.TimepointType;
Expand Down Expand Up @@ -63,10 +62,4 @@ public Set<String> getReservedPropertyNames(Domain domain, User user)

return Collections.unmodifiableSet(fields);
}

@Override
public boolean isProvisioned(Container container, String name)
{
return !isQueryDataset(container, name);
}
}
6 changes: 6 additions & 0 deletions study/src/org/labkey/study/model/DatasetDomainKind.java
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,12 @@ public boolean supportsPhiLevel()
return ComplianceService.get().isComplianceSupported();
}

@Override
public boolean isProvisioned(Container container, String name)
{
return super.isProvisioned(container, name) && !isQueryDataset(container, name);
}

public static boolean isQueryDataset(Container container, String queryName)
{
StudyService ss = StudyService.get();
Expand Down

0 comments on commit 01e1deb

Please sign in to comment.