Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts: src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs src/Umbraco.Core/Constants-Conventions.cs src/Umbraco.Core/Models/Member.cs src/Umbraco.Core/Models/Membership/IUser.cs src/Umbraco.Core/Models/Template.cs src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs src/Umbraco.Core/Persistence/RepositoryFactory.cs src/Umbraco.Core/Services/ContentService.cs src/Umbraco.Core/Services/IMemberTypeService.cs src/Umbraco.Core/Services/IMembershipUserService.cs src/Umbraco.Core/Services/IUserService.cs src/Umbraco.Core/Services/MemberService.cs src/Umbraco.Core/Services/MemberTypeService.cs src/Umbraco.Core/Services/ServiceContext.cs src/Umbraco.Core/Services/UserService.cs src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Tests/MockTests.cs src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Breadcrumb.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListAncestorsFromCurrentPage.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesFromCurrentPage.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByDate.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByName.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesWithDoctype.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListDescendantsFromCurrentPage.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/MultinodeTree-picker.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Navigation.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/SiteMap.cshtml src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs src/Umbraco.Web.UI/config/umbracoSettings.config src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs src/Umbraco.Web/Controllers/UmbLoginController.cs src/Umbraco.Web/Controllers/UmbLoginStatusController.cs src/Umbraco.Web/Controllers/UmbProfileController.cs src/Umbraco.Web/Controllers/UmbRegisterController.cs src/Umbraco.Web/Models/LoginModel.cs src/Umbraco.Web/Models/LoginStatusModel.cs src/Umbraco.Web/Models/ProfileModel.cs src/Umbraco.Web/Models/RegisterModel.cs src/Umbraco.Web/Models/UmbracoProperty.cs src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs src/Umbraco.Web/Security/WebSecurity.cs src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/UmbracoModule.cs src/Umbraco.Web/WebApi/UmbracoApiController.cs src/Umbraco.Web/umbraco.presentation/library.cs src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewMacrosTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs src/umbraco.businesslogic/User.cs src/umbraco.providers/UsersMembershipProvider.cs src/umbraco.providers/members/UmbracoMembershipProvider.cs
This commit is contained in:
Shannon
@@ -238,7 +238,7 @@ namespace Umbraco.Web.Cache
|
||||
|
||||
#region Member cache
|
||||
/// <summary>
|
||||
/// Refreshes the cache amongst servers for a member
|
||||
/// Refreshes the cache among servers for a member
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberId"></param>
|
||||
@@ -248,7 +248,7 @@ namespace Umbraco.Web.Cache
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes the cache amongst servers for a member
|
||||
/// Removes the cache among servers for a member
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberId"></param>
|
||||
@@ -256,6 +256,30 @@ namespace Umbraco.Web.Cache
|
||||
{
|
||||
dc.Remove(new Guid(DistributedCache.MemberCacheRefresherId), memberId);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Member group cache
|
||||
/// <summary>
|
||||
/// Refreshes the cache among servers for a member group
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberGroupId"></param>
|
||||
public static void RefreshMemberGroupCache(this DistributedCache dc, int memberGroupId)
|
||||
{
|
||||
dc.Refresh(new Guid(DistributedCache.MemberGroupCacheRefresherId), memberGroupId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes the cache among servers for a member group
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberGroupId"></param>
|
||||
public static void RemoveMemberGroupCache(this DistributedCache dc, int memberGroupId)
|
||||
{
|
||||
dc.Remove(new Guid(DistributedCache.MemberGroupCacheRefresherId), memberGroupId);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Media Cache
|
||||
@@ -382,7 +406,7 @@ namespace Umbraco.Web.Cache
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Content type cache
|
||||
#region Document type cache
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given content type
|
||||
@@ -393,27 +417,11 @@ namespace Umbraco.Web.Cache
|
||||
{
|
||||
if (contentType != null)
|
||||
{
|
||||
//dc.Refresh(new Guid(DistributedCache.ContentTypeCacheRefresherId), x => x.Id, contentType);
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(false, contentType));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given media type
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="mediaType"></param>
|
||||
public static void RefreshMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
|
||||
{
|
||||
if (mediaType != null)
|
||||
{
|
||||
//dc.Refresh(new Guid(DistributedCache.ContentTypeCacheRefresherId), x => x.Id, mediaType);
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(false, mediaType));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given content type
|
||||
/// </summary>
|
||||
@@ -423,12 +431,29 @@ namespace Umbraco.Web.Cache
|
||||
{
|
||||
if (contentType != null)
|
||||
{
|
||||
//dc.Remove(new Guid(DistributedCache.ContentTypeCacheRefresherId), x => x.Id, contentType);
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(true, contentType));
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Media type cache
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given media type
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="mediaType"></param>
|
||||
public static void RefreshMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
|
||||
{
|
||||
if (mediaType != null)
|
||||
{
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(false, mediaType));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given media type
|
||||
/// </summary>
|
||||
@@ -438,13 +463,46 @@ namespace Umbraco.Web.Cache
|
||||
{
|
||||
if (mediaType != null)
|
||||
{
|
||||
//dc.Remove(new Guid(DistributedCache.ContentTypeCacheRefresherId), x => x.Id, mediaType);
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(true, mediaType));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Media type cache
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given media type
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberType"></param>
|
||||
public static void RefreshMemberTypeCache(this DistributedCache dc, IMemberType memberType)
|
||||
{
|
||||
if (memberType != null)
|
||||
{
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(false, memberType));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove all cache for a given media type
|
||||
/// </summary>
|
||||
/// <param name="dc"></param>
|
||||
/// <param name="memberType"></param>
|
||||
public static void RemoveMemberTypeCache(this DistributedCache dc, IMemberType memberType)
|
||||
{
|
||||
if (memberType != null)
|
||||
{
|
||||
dc.RefreshByJson(new Guid(DistributedCache.ContentTypeCacheRefresherId),
|
||||
ContentTypeCacheRefresher.SerializeToJsonPayload(true, memberType));
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Stylesheet Cache
|
||||
|
||||
public static void RefreshStylesheetPropertyCache(this DistributedCache dc, global::umbraco.cms.businesslogic.web.StylesheetProperty styleSheetProperty)
|
||||
|
||||
Reference in New Issue
Block a user