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

Updated view engine to look only in App_Plugins/ not App_Plugins/Packages/.

Browse Source 
Updated view engine to automatically create the required razor web.config in the packages
Views folder if it is not there already.
This commit is contained in:
Shannon Deminick
2012-10-01 23:43:47 +05:00
parent bc04d4f8da
commit 45c335702d
5 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -2221,7 +2221,7 @@
<ItemGroup>
<Folder Include="App_Code\" />
<Folder Include="App_Data\" />
<Folder Include="App_Plugins\Packages\" />
<Folder Include="App_Plugins\" />
<Folder Include="css\" />
<Folder Include="macroScripts\" />
<Folder Include="masterpages\" />

5
src/Umbraco.Web/Mvc/PluginControllerArea.cs
View File

@@ -58,6 +58,11 @@ namespace Umbraco.Web.Mvc
/// </summary>
/// <param name="routes"></param>
/// <param name="surfaceControllers"></param>
/// <remarks>
/// The routes will be:
///
/// /Umbraco/[AreaName]/[ControllerName]/[Action]/[Id]
/// </remarks>
private void MapRouteSurfaceControllers(RouteCollection routes, IEnumerable<PluginControllerMetadata> surfaceControllers)
{
foreach (var s in surfaceControllers)

64
src/Umbraco.Web/Mvc/PluginViewEngine.cs
View File

@@ -1,5 +1,7 @@
using System.IO;
using System.Linq;
using System.Web.Mvc;
using Umbraco.Core.IO;
namespace Umbraco.Web.Mvc
{
@@ -31,16 +33,16 @@ namespace Umbraco.Web.Mvc
var viewLocationsArray = new[]
{
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/{1}/{0}.vbhtml")
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.vbhtml")
};
//set all of the area view locations to the plugin folder
AreaViewLocationFormats = viewLocationsArray
.Concat(new[]
{
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Shared/{0}.vbhtml")
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.vbhtml")
})
.ToArray();
@@ -49,17 +51,55 @@ namespace Umbraco.Web.Mvc
AreaPartialViewLocationFormats = new[]
{
//will be used when we have partial view and child action macros
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Partials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Partials/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/MacroPartials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/MacroPartials/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Partials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Partials/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/MacroPartials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/MacroPartials/{0}.vbhtml"),
//for partials
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/{1}/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/Packages/{2}/Views/Shared/{0}.vbhtml")
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.vbhtml")
};
}
/// <summary>
/// Ensures that the correct web.config for razor exists in the /Views folder.
/// </summary>
private void EnsureFolderAndWebConfig(ViewEngineResult result)
{
if (result.View == null) return;
var razorResult = result.View as RazorView;
if (razorResult == null) return;
var folder = Path.GetDirectoryName(IOHelper.MapPath(razorResult.ViewPath));
//now we need to get the /View/ folder
var viewFolder = folder.Substring(0, folder.LastIndexOf("\\Views\\")) + "\\Views";
//ensure the web.config file is in the ~/Views folder
Directory.CreateDirectory(viewFolder);
if (!File.Exists(Path.Combine(viewFolder, "web.config")))
{
using (var writer = File.CreateText(Path.Combine(viewFolder, "web.config")))
{
writer.Write(Strings.web_config);
}
}
}
public override ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache)
{
var result = base.FindView(controllerContext, viewName, masterName, useCache);
EnsureFolderAndWebConfig(result);
return result;
}
public override ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache)
{
var result = base.FindPartialView(controllerContext, partialViewName, useCache);
EnsureFolderAndWebConfig(result);
return result;
}
}
}

38
src/Umbraco.Web/Mvc/SurfaceController.cs
View File

@@ -9,31 +9,31 @@ namespace Umbraco.Web.Mvc
//[PluginController("MyTestSurfaceController")]
//public class TestSurfaceController : SurfaceController
//{
// public ActionResult Index()
// {
// return View();
// //return Content("<html><body>hello</body></html>");
// }
// public ActionResult Index()
// {
// return View();
// //return Content("<html><body>hello</body></html>");
// }
// public ActionResult PostVals(string name)
// {
// ModelState.AddModelError("name", "bad name!");
// return CurrentUmbracoPage();
// }
// public ActionResult PostVals(string name)
// {
// ModelState.AddModelError("name", "bad name!");
// return CurrentUmbracoPage();
// }
//}
//public class LocalSurfaceController : SurfaceController
//{
// public ActionResult Index()
// {
// return View();
// }
// public ActionResult Index()
// {
// return View();
// }
// public ActionResult PostVals([Bind(Prefix = "blah")]string name)
// {
// ModelState.AddModelError("name", "you suck!");
// return this.RedirectToCurrentUmbracoPage();
// }
// public ActionResult PostVals([Bind(Prefix = "blah")]string name)
// {
// ModelState.AddModelError("name", "you suck!");
// return this.RedirectToCurrentUmbracoPage();
// }
//}
/// <summary>