From 01e1deb2ee5c47566205f5292747e608f304abc2 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 6 Jan 2025 15:16:16 -0800 Subject: [PATCH] Move isProvisioned to abstract class --- .../labkey/study/model/ContinuousDatasetDomainKind.java | 7 ------- study/src/org/labkey/study/model/DatasetDomainKind.java | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/study/src/org/labkey/study/model/ContinuousDatasetDomainKind.java b/study/src/org/labkey/study/model/ContinuousDatasetDomainKind.java index 7de7af4afd2..3e314a9a557 100644 --- a/study/src/org/labkey/study/model/ContinuousDatasetDomainKind.java +++ b/study/src/org/labkey/study/model/ContinuousDatasetDomainKind.java @@ -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; @@ -63,10 +62,4 @@ public Set getReservedPropertyNames(Domain domain, User user) return Collections.unmodifiableSet(fields); } - - @Override - public boolean isProvisioned(Container container, String name) - { - return !isQueryDataset(container, name); - } } diff --git a/study/src/org/labkey/study/model/DatasetDomainKind.java b/study/src/org/labkey/study/model/DatasetDomainKind.java index b79aa87128d..421871e2ca1 100644 --- a/study/src/org/labkey/study/model/DatasetDomainKind.java +++ b/study/src/org/labkey/study/model/DatasetDomainKind.java @@ -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();