From cb8dbf9da578c6b09cda0a9c4f8b07f765b28fcd Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Dec 2013 18:14:04 +1100 Subject: [PATCH] fixes up some merge issues --- .../Services/ContentServiceTests.cs | 21 ------- .../members/MembersMembershipProvider.cs | 59 ------------------- .../members/MembershipEventHandler.cs | 35 +++++++++++ .../umbraco.providers.csproj | 1 + 4 files changed, 36 insertions(+), 80 deletions(-) create mode 100644 src/umbraco.providers/members/MembershipEventHandler.cs diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index 3c36f1c282..f34a2a70eb 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -223,27 +223,6 @@ namespace Umbraco.Tests.Services Assert.That(content.WriterId, Is.EqualTo(user.Id)); } - [Test] - public void Can_Save_New_Content_With_Explicit_User() - { - var user = new User(ServiceContext.UserService.GetUserTypeByAlias("admin")) - { - Name = "Test", - Email = "test@test.com", - Username = "test", - Password = "test" - }; - ServiceContext.UserService.SaveUser(user); - var content = new Content("Test", -1, ServiceContext.ContentTypeService.GetContentType("umbTextpage")); - - // Act - ServiceContext.ContentService.Save(content, (int)user.Id); - - // Assert - Assert.That(content.CreatorId, Is.EqualTo(user.Id)); - Assert.That(content.WriterId, Is.EqualTo(user.Id)); - } - [Test] public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias() { diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs index 187baf2845..b8d207b9a8 100644 --- a/src/umbraco.providers/members/MembersMembershipProvider.cs +++ b/src/umbraco.providers/members/MembersMembershipProvider.cs @@ -13,7 +13,6 @@ using System.Security.Cryptography; using System.Web.Util; using System.Collections.Specialized; using System.Configuration.Provider; -using umbraco.cms.businesslogic; using System.Security; using System.Security.Permissions; using System.Runtime.CompilerServices; @@ -1024,62 +1023,4 @@ namespace umbraco.providers.members #endregion } - - /// - /// Adds some event handling - /// - public class MembershipEventHandler : ApplicationEventHandler - { - protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) - { - Member.New += Member_New; - } - - void Member_New(Member sender, NewEventArgs e) - { - //This is a bit of a hack to ensure that the member is approved when created since many people will be using - // this old api to create members on the front-end and they need to be approved - which is based on whether or not - // the Umbraco membership provider is configured. - var provider = Membership.Provider as UmbracoMembershipProvider; - if (provider != null) - { - var approvedField = provider.ApprovedPropertyTypeAlias; - var property = sender.getProperty(approvedField); - if (property != null) - { - property.Value = 1; - } - } - } - } - - //TODO: We need to re-enable this in 6.2, but need to back port most of the membership provider changes (still in a custom branch atm) - - ///// - ///// Adds some event handling - ///// - //public class MembershipEventHandler : ApplicationEventHandler - //{ - // protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) - // { - // Member.New += Member_New; - // } - - // void Member_New(Member sender, NewEventArgs e) - // { - // //This is a bit of a hack to ensure that the member is approved when created since many people will be using - // // this old api to create members on the front-end and they need to be approved - which is based on whether or not - // // the Umbraco membership provider is configured. - // var provider = Membership.Provider as UmbracoMembershipProvider; - // if (provider != null) - // { - // var approvedField = provider.ApprovedPropertyTypeAlias; - // var property = sender.getProperty(approvedField); - // if (property != null) - // { - // property.Value = 1; - // } - // } - // } - //} } diff --git a/src/umbraco.providers/members/MembershipEventHandler.cs b/src/umbraco.providers/members/MembershipEventHandler.cs new file mode 100644 index 0000000000..c77e46e523 --- /dev/null +++ b/src/umbraco.providers/members/MembershipEventHandler.cs @@ -0,0 +1,35 @@ +using System.Web.Security; +using Umbraco.Core; +using umbraco.cms.businesslogic; +using umbraco.cms.businesslogic.member; + +namespace umbraco.providers.members +{ + /// + /// Adds some event handling + /// + public class MembershipEventHandler : ApplicationEventHandler + { + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + { + Member.New += Member_New; + } + + void Member_New(Member sender, NewEventArgs e) + { + //This is a bit of a hack to ensure that the member is approved when created since many people will be using + // this old api to create members on the front-end and they need to be approved - which is based on whether or not + // the Umbraco membership provider is configured. + var provider = Membership.Provider as UmbracoMembershipProvider; + if (provider != null) + { + var approvedField = provider.ApprovedPropertyTypeAlias; + var property = sender.getProperty(approvedField); + if (property != null) + { + property.Value = 1; + } + } + } + } +} \ No newline at end of file diff --git a/src/umbraco.providers/umbraco.providers.csproj b/src/umbraco.providers/umbraco.providers.csproj index 8d96f0e181..9604093d93 100644 --- a/src/umbraco.providers/umbraco.providers.csproj +++ b/src/umbraco.providers/umbraco.providers.csproj @@ -81,6 +81,7 @@ Properties\SolutionInfo.cs +