Backports commit: Prefixed built in controllers to better avoid conflicts with people's custom code

Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	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/Umbraco.Web.csproj
This commit is contained in:
Shannon
2014-01-28 13:47:16 +11:00
parent 677cc8c8fd
commit e4e76eb0bf
13 changed files with 17 additions and 17 deletions

View File

@@ -7,7 +7,7 @@ using Umbraco.Web.Mvc;
namespace Umbraco.Web.Controllers
{
public class LoginController : SurfaceController
public class UmbLoginController : SurfaceController
{
[HttpPost]
public ActionResult HandleLogin([Bind(Prefix="loginModel")]LoginModel model)

View File

@@ -7,7 +7,7 @@ using Umbraco.Web.Mvc;
namespace Umbraco.Web.Controllers
{
public class LoginStatusController : SurfaceController
public class UmbLoginStatusController : SurfaceController
{
[HttpPost]
public ActionResult HandleLogout([Bind(Prefix = "loginStatusModel")]LoginStatusModel model)

View File

@@ -10,14 +10,14 @@ using Umbraco.Core.Security;
namespace Umbraco.Web.Controllers
{
public class ProfileController : SurfaceController
public class UmbProfileController : SurfaceController
{
[HttpPost]
public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
{
if (Membership.Provider.IsUmbracoMembershipProvider() == false)
{
throw new NotSupportedException("Profile editing with the " + typeof (ProfileController) + " is not supported when not using the default Umbraco membership provider");
throw new NotSupportedException("Profile editing with the " + typeof(UmbProfileController) + " is not supported when not using the default Umbraco membership provider");
}
if (ModelState.IsValid == false)

View File

@@ -9,7 +9,7 @@ using Umbraco.Web.Mvc;
namespace Umbraco.Web.Controllers
{
public class RegisterController : SurfaceController
public class UmbRegisterController : SurfaceController
{
[HttpPost]
public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)