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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
View File

@@ -21,7 +21,7 @@
{
@Html.RenderJsHere()
using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
{
<fieldset>
<legend>Edit profile</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
View File

@@ -18,7 +18,7 @@
@Html.RenderJsHere()
@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
{
<fieldset>
<legend>Login</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
View File

@@ -20,7 +20,7 @@
{
<p>You are currently logged in as @loginStatusModel.Name</p>
using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
<fieldset>
<legend>Logout</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
View File

@@ -45,7 +45,7 @@
}
else
{
using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
{
<fieldset>
<legend>Register Member</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
View File

@@ -21,7 +21,7 @@
{
@Html.RenderJsHere()
using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
{
<fieldset>
<legend>Edit profile</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
View File

@@ -18,7 +18,7 @@
@Html.RenderJsHere()
@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
{
<fieldset>
<legend>Login</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
View File

@@ -21,7 +21,7 @@
{
<p>You are currently logged in as @loginStatusModel.Name</p>
using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
<fieldset>
<legend>Logout</legend>

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
View File

@@ -45,7 +45,7 @@
}
else
{
using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
{
<fieldset>
<legend>Register Member</legend>

2
src/Umbraco.Web/Controllers/LoginController.cs → src/Umbraco.Web/Controllers/UmbLoginController.cs
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)

2
src/Umbraco.Web/Controllers/LoginStatusController.cs → src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
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)

4
src/Umbraco.Web/Controllers/ProfileController.cs → src/Umbraco.Web/Controllers/UmbProfileController.cs
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)

2
src/Umbraco.Web/Controllers/RegisterController.cs → src/Umbraco.Web/Controllers/UmbRegisterController.cs
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)

8
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -291,8 +291,8 @@
<Compile Include="Cache\UserPermissionsCacheRefresher.cs" />
<Compile Include="Cache\UserTypeCacheRefresher.cs" />
<Compile Include="Configuration\WebRouting.cs" />
<Compile Include="Controllers\ProfileController.cs" />
<Compile Include="Controllers\LoginStatusController.cs" />
<Compile Include="Controllers\UmbProfileController.cs" />
<Compile Include="Controllers\UmbLoginStatusController.cs" />
<Compile Include="Editors\MediaController.cs" />
<Compile Include="Models\ChangingPasswordModel.cs" />
<Compile Include="Models\IRenderModel.cs" />
@@ -301,7 +301,7 @@
<Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
<Compile Include="Mvc\UmbracoViewPage.cs" />
<Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
<Compile Include="Controllers\RegisterController.cs" />
<Compile Include="Controllers\UmbRegisterController.cs" />
<Compile Include="Models\PasswordChangedModel.cs" />
<Compile Include="Models\ProfileModel.cs" />
<Compile Include="Models\LoginStatusModel.cs" />
@@ -454,7 +454,7 @@
<Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Controllers\LoginController.cs" />
<Compile Include="Controllers\UmbLoginController.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
<Compile Include="UrlHelperExtensions.cs" />
<Compile Include="UrlHelperRenderExtensions.cs" />