Skip to content

Dls release v1.2.0 #3106

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
Feb 3, 2025
Merged

Dls release v1.2.0 #3106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe52c5c
TD-5329 Moves fwc.isdeleted to join instead of where clause to ensure…
kevwhitt-hee Feb 3, 2025
bad2fe0
Merge pull request #3105 from TechnologyEnhancedLearning/Develop/Fixe…
kevwhitt-hee Feb 3, 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
8 changes: 4 additions & 4 deletions DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,10 +1851,10 @@ FROM Competencies AS C INNER JOIN
public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)
{
return connection.QuerySingle<int>(
@"SELECT CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN fwc.CanModify = 1 THEN 2 WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole
FROM Frameworks AS FW LEFT OUTER JOIN
FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId
WHERE FW.ID = @frameworkId and FWC.IsDeleted=0",
@"SELECT CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN COALESCE (fwc.CanModify, 0) = 1 THEN 2 WHEN COALESCE (fwc.CanModify, 0) = 0 THEN 1 ELSE 0 END AS UserRole
FROM Frameworks AS FW LEFT OUTER JOIN
FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND fwc.IsDeleted = 0
WHERE (FW.ID = @frameworkId)",
new { adminId, frameworkId }
);
}
Expand Down
Loading