From ec592c369b5e058bd4c5d5414261da4e42881b2b Mon Sep 17 00:00:00 2001 From: auldrinpossa Date: Fri, 20 Jun 2025 07:42:24 +0100 Subject: [PATCH 1/2] TD-5658-Empty framework/group validation added to show/hide buttons --- .../Views/Frameworks/Developer/Framework.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml index fcd666f6a3..ee21a036a7 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml @@ -44,7 +44,7 @@
@*Preview*@ - @if (Model.DetailFramework.UserRole > 1) + @if ((Model.FrameworkCompetencyGroups?.Any() == true || Model.FrameworkCompetencies?.Any() == true) && Model.DetailFramework.UserRole > 1) { if (Model.DetailFramework.PublishStatusID == 2) { From 9ecac9d175bb77d3c22959b554e7eabd91cc75f6 Mon Sep 17 00:00:00 2001 From: auldrinpossa Date: Fri, 20 Jun 2025 11:32:40 +0100 Subject: [PATCH 2/2] TD-5658 - Added group capability existence check. --- .../Views/Frameworks/Developer/Framework.cshtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml index ee21a036a7..f8e4cf0498 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml @@ -4,6 +4,8 @@ ViewData["Title"] = Model.DetailFramework.FrameworkName; ViewData["Application"] = "Framework Service"; ViewData["HeaderPathName"] = "Framework Service"; + bool isGroupCompetenciesNotEmpty = Model.FrameworkCompetencyGroups != null && + Model.FrameworkCompetencyGroups.Any(g => g.FrameworkCompetencies != null && g.FrameworkCompetencies.Any()); } @section NavMenuItems { @@ -44,7 +46,7 @@
@*Preview*@ - @if ((Model.FrameworkCompetencyGroups?.Any() == true || Model.FrameworkCompetencies?.Any() == true) && Model.DetailFramework.UserRole > 1) + @if ((isGroupCompetenciesNotEmpty || Model.FrameworkCompetencies?.Any() == true) && Model.DetailFramework.UserRole > 1) { if (Model.DetailFramework.PublishStatusID == 2) {