From 4920d7dedfd9f010633826c4f30126a4c065da64 Mon Sep 17 00:00:00 2001 From: tznind Date: Tue, 30 Aug 2022 09:48:37 +0100 Subject: [PATCH] The 'Core' folder in extraction execution user interface is no longer disabled when empty --- CHANGELOG.md | 8 +++----- Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c47a20b537..f2bc67ba75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ... -### Changed -- Removed restriction preventing [Lookup] requiring all foreign key columns being from the same table [#1331](https://github.com/HicServices/RDMP/issues/1307) -- If there are multiple IsPrimaryExtractionTable involved in a query then the one with the IsExtractionIdentifier column (if any) will be picked (previously QueryBuildingException was thrown) [#1365](https://github.com/HicServices/RDMP/issues/1365) - ### Added - Added 'Set Description' command to [AggregateConfiguration] context menu - Template cohort builder aggregates can be dragged onto extraction datasets to import the container tree [#1307](https://github.com/HicServices/RDMP/issues/1307) @@ -20,8 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added ability to pop out tooltips/problems into modal popup [#1334](https://github.com/HicServices/RDMP/issues/1334) ### Changed - +- The 'Core' folder in extraction execution user interface is no longer disabled when empty [#1377](https://github.com/HicServices/RDMP/issues/1377) - Datasets in extraction UI are no longer expanded by default (i.e. to show Supporting Documents/Sql) [#1264](https://github.com/HicServices/RDMP/issues/1264) +- Removed restriction preventing [Lookup] requiring all foreign key columns being from the same table [#1331](https://github.com/HicServices/RDMP/issues/1307) +- If there are multiple IsPrimaryExtractionTable involved in a query then the one with the IsExtractionIdentifier column (if any) will be picked (previously QueryBuildingException was thrown) [#1365](https://github.com/HicServices/RDMP/issues/1365) ### Fixed diff --git a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs index d9f0277ecb..59a9383740 100644 --- a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs +++ b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs @@ -286,11 +286,7 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi //if there are no project specific datasets if (_datasets.All(sds => sds.ExtractableDataSet.Project_ID == null)) tlvDatasets.DisableObject(_projectSpecificDatasetsFolder); //disable this option - - //if all the datasets are project specific - if (_datasets.All(sds => sds.ExtractableDataSet.Project_ID != null)) - tlvDatasets.DisableObject(_coreDatasetsFolder); - + //don't accept refresh while executing if (checkAndExecuteUI1.IsExecuting) return;