Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions DigitalLearningSolutions.Web/Helpers/StringHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace DigitalLearningSolutions.Web.Helpers
{
using System;
using System.Text.RegularExpressions;
using DigitalLearningSolutions.Data.Extensions;
using Microsoft.Extensions.Configuration;

Expand All @@ -16,5 +17,17 @@ public static string GetLocalRedirectUrl(IConfiguration config, string basicUrl)
var applicationPath = new Uri(config.GetAppRootPath()).AbsolutePath.TrimEnd('/');
return applicationPath + basicUrl;
}
public static string StripHtmlTags(string input)
{
if (string.IsNullOrWhiteSpace(input))
{
return string.Empty;
}

// Remove HTML tags
string result = Regex.Replace(input, "<.*?>", string.Empty).Trim();

return string.IsNullOrEmpty(result) ? string.Empty : result;
}
}
}
8 changes: 7 additions & 1 deletion DigitalLearningSolutions.Web/Services/FrameworkService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using DigitalLearningSolutions.Data.Models.Frameworks.Import;
using DigitalLearningSolutions.Data.Models.SelfAssessments;
using System.Collections.Generic;
using DigitalLearningSolutions.Web.Helpers;
using AssessmentQuestion = DigitalLearningSolutions.Data.Models.Frameworks.AssessmentQuestion;
using CompetencyResourceAssessmentQuestionParameter =
DigitalLearningSolutions.Data.Models.Frameworks.CompetencyResourceAssessmentQuestionParameter;
Expand Down Expand Up @@ -516,7 +517,12 @@ public FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int framew

public DetailFramework? GetFrameworkDetailByFrameworkId(int frameworkId, int adminId)
{
return frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
var detailFramework = frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
if (StringHelper.StripHtmlTags(detailFramework.Description) == string.Empty)
{
detailFramework.Description = string.Empty;
}
return detailFramework;
}

public FrameworkReview? GetFrameworkReview(int frameworkId, int adminId, int reviewId)
Expand Down
Loading