Skip to content

Domain Templates: reserve column names #1136

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

Open
labkey-nicka wants to merge 1 commit into
base: develop
Choose a base branch
from
+0 −20
Open

Domain Templates: reserve column names #1136

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: 0 additions & 10 deletions EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/model/EHRComplianceDBDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package org.labkey.ehr_compliancedb.model;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.exp.property.Domain;
import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
import org.labkey.api.query.ExtendedTableDomainKind;
import org.labkey.api.security.User;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.data.xml.domainTemplate.DomainTemplateType;
import org.labkey.data.xml.domainTemplate.EHRComplianceDBTemplateType;


import java.util.List;
import java.util.Set;

public class EHRComplianceDBDomainKind extends ExtendedTableDomainKind
{
Expand Down Expand Up @@ -42,12 +38,6 @@ public String getKindName()
return KIND_NAME;
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
{
return super.getReservedPropertyNames(domain, user);
}

@Override
public boolean matchesTemplateXML(String templateName, DomainTemplateType template, List<GWTPropertyDescriptor> properties)
{
Expand Down
10 changes: 0 additions & 10 deletions ehr/src/org/labkey/ehr/model/EHRDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,15 @@
package org.labkey.ehr.model;


import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.exp.property.Domain;
import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
import org.labkey.api.query.ExtendedTableDomainKind;
import org.labkey.api.security.User;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.data.xml.domainTemplate.DomainTemplateType;
import org.labkey.data.xml.domainTemplate.EHRTemplateType;


import java.util.List;
import java.util.Set;

public class EHRDomainKind extends ExtendedTableDomainKind
{
Expand Down Expand Up @@ -63,12 +59,6 @@ public String getKindName()
return KIND_NAME;
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
{
return super.getReservedPropertyNames(domain, user);
}

@Override
public boolean matchesTemplateXML(String templateName, DomainTemplateType template, List<GWTPropertyDescriptor> properties)
{
Expand Down