Skip to content

Commit

Permalink
Merge pull request #1386 from HicServices/no-disable-core
Browse files Browse the repository at this point in the history
The 'Core' folder in extraction execution user interface is no longer…
  • Loading branch information
jas88 committed Aug 30, 2022
2 parents a780a98 + 4920d7d commit f366ba8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
8 changes: 3 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
6 changes: 1 addition & 5 deletions Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f366ba8

Please sign in to comment.