Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactor host user security model, support static assets in modules and themes, module definition permissions and categories, paging control, remove SiteUsers, move seed data from script to site template for installation

Browse Source
This commit is contained in:
Shaun Walker
2019-09-19 16:33:48 -04:00
parent 35b9b9e89b
commit 83a212e7e3
61 changed files with 1000 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Oqtane.Server/Repository/UserRoleRepository.cs
View File

@ -18,17 +18,20 @@ namespace Oqtane.Repository
{
return db.UserRole;
}
public IEnumerable<UserRole> GetUserRoles(int UserId)
public IEnumerable<UserRole> GetUserRoles(int SiteId)
{
return db.UserRole.Where(item => item.UserId == UserId)
.Include(item => item.Role); // eager load roles
return db.UserRole
.Include(item => item.Role) // eager load roles
.Include(item => item.User) // eager load users
.Where(item => item.Role.SiteId == SiteId);
}
public IEnumerable<UserRole> GetUserRoles(int UserId, int SiteId)
{
return db.UserRole.Where(item => item.UserId == UserId)
.Include(item => item.Role) // eager load roles
.Where(item => item.Role.SiteId == SiteId);
.Include(item => item.User) // eager load users
.Where(item => item.Role.SiteId == SiteId || item.Role.SiteId == null);
}
public UserRole AddUserRole(UserRole UserRole)
@ -47,7 +50,9 @@ namespace Oqtane.Repository
public UserRole GetUserRole(int UserRoleId)
{
return db.UserRole.Include(item => item.Role) // eager load roles
return db.UserRole
.Include(item => item.Role) // eager load roles
.Include(item => item.User) // eager load users
.SingleOrDefault(item => item.UserRoleId == UserRoleId);
}