Merge pull request #2312 from HicServices/task/RDMP-361-cohort-commit-associate-projects

Task/rdmp 361 cohort commit associate projects

Author: rdteviotdale

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Internal Note to Catalogue
 - Fix issue where project associations were not copied when a CIC was cloned
 - Fix issue with using Internal Catalogues in Cohort Identification Configurations
+- Fix bug with copying project specific Catalogues between Projects when committing a Cohort
 
 ## [9.1.2] - Unreleased
 - Automatically fetch user settings from previous versions of RDMP when installing the latest version

Rdmp.UI/SimpleDialogs/Cohorts/CohortCommitProjectSelectionUI.cs

@@ -7,6 +7,7 @@
 using Rdmp.Core.MapsDirectlyToDatabaseTable;
 using Rdmp.Core.Providers;
 using Rdmp.UI.ItemActivation;
+using Rdmp.UI.ProjectUI;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 using System;
 using System.Collections.Generic;
@@ -122,6 +123,15 @@ private void btnExistingProject_Click(object sender, EventArgs e)
             if (selected != null)
             {
                 Result = selected as Project;
+                if (_currentProject != null)
+                {
+                    var projectSpecificCatalogues = _currentProject.GetAllProjectCatalogues().Where(p => p.IsProjectSpecific(_activator.RepositoryLocator.DataExportRepository));
+                    foreach (var psc in projectSpecificCatalogues)
+                    {
+                        var cmd = new ExecuteCommandMakeCatalogueProjectSpecific(_activator, psc, Result, true);
+                        cmd.Execute();
+                    }
+                }
                 DialogResult = DialogResult.OK;
                 Close();
             }