Skip to content

Update FrameworkService.cs #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevwhitt-hee merged 1 commit into from
Sep 16, 2022
Merged

Update FrameworkService.cs #1399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Data/Services/FrameworkService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ public int InsertCompetencyGroup(string groupName, string? groupDescription, int
);
return -2;
}
groupDescription = (groupDescription?.Trim() == "" ? null : groupDescription);
var existingId = (int)connection.ExecuteScalar(
@"SELECT COALESCE ((SELECT TOP(1)ID FROM CompetencyGroups WHERE [Name] = @groupName AND (@groupDescription IS NULL OR Description = @groupDescription)), 0) AS CompetencyGroupID",
new { groupName, groupDescription }
Expand Down Expand Up @@ -622,7 +623,7 @@ public int InsertCompetency(string name, string? description, int adminId)
);
return -2;
}

description = (description?.Trim() == "" ? null : description);
var existingId = 0;
if (description == null)
{
Expand Down