Skip to content

TD-5709 fix frameworks error affecting some users #3299

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
merged 2 commits into from
Jul 21, 2025
Merged

TD-5709 fix frameworks error affecting some users #3299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15214bf
TD-5709 fixes subquery returns multiple results error
kevwhitt-hee Jun 24, 2025
271f4d1
TD-5709 Added where clause to limit the results to active admin records
rshrirohit Jul 8, 2025
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
5 changes: 3 additions & 2 deletions DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,13 @@ FROM FrameworkCollaborators fc
AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)) > 0 THEN 1
ELSE 0
END AS UserRole,
(SELECT fwr.ID
(SELECT TOP(1) fwr.ID
FROM FrameworkCollaborators fc
INNER JOIN AdminAccounts aa3 ON fc.AdminID = aa3.ID
LEFT OUTER JOIN FrameworkReviews AS fwr ON fc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL
WHERE fc.FrameworkID = fw.ID AND fc.IsDeleted = 0
AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)) AS FrameworkReviewID";
AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)
AND aa3.Active = 1 ORDER BY fwr.ID DESC) AS FrameworkReviewID";

private const string BrandedFrameworkFields =
@",(SELECT BrandName
Expand Down
Loading