Merge pull request #3093 from TechnologyEnhancedLearning/Develop/Fixes/TD-4169-FrameworkContributorPermissionNotWorking

rshrirohit · web-flow · commit 034e13762f4e · 2025-01-30T10:09:42.000Z
TD-4169 Framework Contributor Permission Not Working
diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -1827,7 +1827,7 @@ public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)
                 @"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",
+                WHERE FW.ID = @frameworkId and FWC.IsDeleted=0",
                 new { adminId, frameworkId }
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -1827,7 +1827,7 @@ public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)`
`1827`	`1827`	`@"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`
`1828`	`1828`	`FROM Frameworks AS FW LEFT OUTER JOIN`
`1829`	`1829`	`FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId`
`1830`		`- WHERE FW.ID = @frameworkId",`
	`1830`	`+ WHERE FW.ID = @frameworkId and FWC.IsDeleted=0",`
`1831`	`1831`	`new { adminId, frameworkId }`
`1832`	`1832`	`);`
`1833`	`1833`	`}`