Merge pull request #2971 from TechnologyEnhancedLearning/release-v1.0.0

Release v1.0.0 to UAT

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs

@@ -189,14 +189,10 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
                     FrameworkGroupId = frameworkCompetencyGroupId,
                     FrameworkCompetencyId = frameworkCompetencyId,
                     FrameworkConfig = detailFramework?.FrameworkConfig,
-                    Competency = new FrameworkCompetency()
-                    {
-                        Name = frameworkCompetency.Name,
-                        Description = frameworkCompetency.Description
-                    },
+                    Competency = frameworkCompetency,
                     MatchingSearchResults = matchingSearchResults.Count,
                     SameCompetency = similarItems,
-                    selectedFlagIds = selectedFlagIds.Any() ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty,
+                    selectedFlagIds = selectedFlagIds != null ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty
                 };
                 return View("Developer/SimilarCompetency", model);
             }