yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
This commit is contained in:
Shannon
2017-05-04 18:29:43 +10:00
parent 751dc8df23 11b97c5291
commit 24e2547656
139 changed files with 4504 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
View File

@@ -41,25 +41,6 @@ namespace Umbraco.Web.Cache
#endregion
#region User type cache
public static void RemoveUserTypeCache(this DistributedCache dc, int userTypeId)
{
dc.Remove(DistributedCache.UserTypeCacheRefresherGuid, userTypeId);
}
public static void RefreshUserTypeCache(this DistributedCache dc, int userTypeId)
{
dc.Refresh(DistributedCache.UserTypeCacheRefresherGuid, userTypeId);
}
public static void RefreshAllUserTypeCache(this DistributedCache dc)
{
dc.RefreshAll(DistributedCache.UserTypeCacheRefresherGuid);
}
#endregion
#region User cache
public static void RemoveUserCache(this DistributedCache dc, int userId)
@@ -75,25 +56,44 @@ namespace Umbraco.Web.Cache
public static void RefreshAllUserCache(this DistributedCache dc)
{
dc.RefreshAll(DistributedCache.UserCacheRefresherGuid);
}
}
#endregion
#region User permissions cache
#region User group cache
public static void RemoveUserPermissionsCache(this DistributedCache dc, int userId)
public static void RemoveUserGroupCache(this DistributedCache dc, int userId)
{
dc.Remove(DistributedCache.UserPermissionsCacheRefresherGuid, userId);
dc.Remove(DistributedCache.UserGroupCacheRefresherGuid, userId);
}
public static void RefreshUserPermissionsCache(this DistributedCache dc, int userId)
public static void RefreshUserGroupCache(this DistributedCache dc, int userId)
{
dc.Refresh(DistributedCache.UserPermissionsCacheRefresherGuid, userId);
dc.Refresh(DistributedCache.UserGroupCacheRefresherGuid, userId);
}
public static void RefreshAllUserPermissionsCache(this DistributedCache dc)
public static void RefreshAllUserGroupCache(this DistributedCache dc)
{
dc.RefreshAll(DistributedCache.UserPermissionsCacheRefresherGuid);
dc.RefreshAll(DistributedCache.UserGroupCacheRefresherGuid);
}
#endregion
#region User group permissions cache
public static void RemoveUserGroupPermissionsCache(this DistributedCache dc, int groupId)
{
dc.Remove(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
}
public static void RefreshUserGroupPermissionsCache(this DistributedCache dc, int groupId)
{
dc.Refresh(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
}
public static void RefreshAllUserGroupPermissionsCache(this DistributedCache dc)
{
dc.RefreshAll(DistributedCache.UserGroupPermissionsCacheRefresherGuid);
}
#endregion