Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions api/src/org/labkey/api/exp/property/DomainUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,6 @@ public static boolean allowMultiChoice(DomainKind<?> kind)
{
if (!kind.allowMultiChoiceProperties())
return false;
if (!OptionalFeatureService.get().isFeatureEnabled(AppProps.MULTI_VALUE_TEXT_CHOICE))
return false;
return CoreSchema.getInstance().getSqlDialect().isPostgreSQL();
}

Expand Down
1 change: 0 additions & 1 deletion api/src/org/labkey/api/settings/AppProps.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public interface AppProps
String ADMIN_PROVIDED_ALLOWED_EXTERNAL_RESOURCES = "allowedExternalResources";
String QUANTITY_COLUMN_SUFFIX_TESTING = "quantityColumnSuffixTesting";
String REJECT_CONTROLLER_FIRST_URLS = "rejectControllerFirstUrls";
String MULTI_VALUE_TEXT_CHOICE = "multiChoiceDataType";

String UNKNOWN_VERSION = "Unknown Release Version";

Expand Down
3 changes: 0 additions & 3 deletions experiment/src/org/labkey/experiment/ExperimentModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@ protected void init()

OptionalFeatureService.get().addExperimentalFeatureFlag(NameGenerator.EXPERIMENTAL_ALLOW_GAP_COUNTER, "Allow gap with withCounter and rootSampleCount expression",
"Check this option if gaps in the count generated by withCounter or rootSampleCount name expression are allowed.", true);

OptionalFeatureService.get().addExperimentalFeatureFlag(AppProps.MULTI_VALUE_TEXT_CHOICE, "Allow multi-value Text Choice properties",
"Support selecting more than one value for text choice fields", false);
}
OptionalFeatureService.get().addExperimentalFeatureFlag(AppProps.QUANTITY_COLUMN_SUFFIX_TESTING, "Quantity column suffix testing",
"If a column name contains a \"__<unit>\" suffix, this feature allows for testing it as a Quantity display column", false);
Expand Down
1 change: 0 additions & 1 deletion study/test/src/org/labkey/test/tests/study/AssayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ public void testAssayNameMaxLength() throws Exception
public void testAssayMultiFileImportForMVTC() throws Exception
{
Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
_containerHelper.createProject(MVTC_MULTI_FILE_IMPORT_PROJECT, "Assay");
new GeneralAssayDesign(MVTC_MULTI_FILE_IMPORT_ASSAY)
.setRunFields(List.of(new FieldDefinition("runText", FieldDefinition.ColumnType.String)), true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ public void testDatasets()
public void testDatasetWithMultiChoice()
{
Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
String datasetName = "Test dataset";
DatasetDesignerPage definitionPage = _studyHelper.goToManageDatasets()
.clickCreateNewDataset()
Expand Down
Loading