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

fixes back office rendering

Browse Source
This commit is contained in:
Shannon
2016-02-17 17:39:12 +01:00
parent e10fb4fd7e
commit 5659f8d3f7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
View File

@@ -11,7 +11,7 @@
@using Umbraco.Web
@using Umbraco.Web.Editors
@using umbraco
@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.AuthorizeUpgradeModel>
@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@{
Layout = null;

4
src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
View File

@@ -12,7 +12,7 @@
@using Umbraco.Web.Editors
@using umbraco
@inherits System.Web.Mvc.WebViewPage
@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@{
var isDebug = false;
@@ -37,7 +37,7 @@
<html lang="en">
<head>
<base href="@GlobalSettings.Path.EnsureEndsWith('/')" />
<base href="@Model.Path.EnsureEndsWith('/')" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">

8
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -38,7 +38,7 @@ using Constants = Umbraco.Core.Constants;
namespace Umbraco.Web.Editors
{
public class AuthorizeUpgradeModel
public class BackOfficeModel
{
public string Path { get; set; }
}
@@ -75,8 +75,8 @@ namespace Umbraco.Web.Editors
public async Task<ActionResult> Default()
{
return await RenderDefaultOrProcessExternalLoginAsync(
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml"),
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml"));
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel { Path = GlobalSettings.Path }),
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel { Path = GlobalSettings.Path }));
}
/// <summary>
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Editors
{
return await RenderDefaultOrProcessExternalLoginAsync(
//The default view to render when there is no external login info or errors
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new AuthorizeUpgradeModel { Path = GlobalSettings.Path}),
() => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel { Path = GlobalSettings.Path}),
//The ActionResult to perform if external login is successful
() => Redirect("/"));
}