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

Updated loghelper to be able to Warn and also trace Warn with an exception. Updated the macro control to check for the

Browse Source 
Partial View Macro, added Partial View macro to the enum.
This commit is contained in:
Shannon Deminick
2012-12-04 05:58:24 +05:00
parent e0a71830fa
commit 8e4644568b
4 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/umbraco.cms/businesslogic/macro/Macro.cs
View File

@@ -4,6 +4,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Xml;
using System.Runtime.CompilerServices;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.cache;
using umbraco.DataLayer;
using umbraco.BusinessLogic;
@@ -530,22 +531,23 @@ namespace umbraco.cms.businesslogic.macro
{
if (!string.IsNullOrEmpty(xslt))
return MacroTypes.XSLT;
else
{
if (!string.IsNullOrEmpty(scriptFile))
return MacroTypes.Script;
else
{
if (!string.IsNullOrEmpty(scriptType) && scriptType.ToLower().IndexOf(".ascx") > -1)
{
return MacroTypes.UserControl;
}
else if (!string.IsNullOrEmpty(scriptType) && !string.IsNullOrEmpty(scriptAssembly))
return MacroTypes.CustomControl;
}
}
if (!string.IsNullOrEmpty(scriptFile))
{
//we need to check if the file path saved is a virtual path starting with ~/Views/MacroPartials, if so then this is
//a partial view macro, not a script macro
return scriptFile.StartsWith(SystemDirectories.MvcViews + "/MacroPartials/")
? MacroTypes.PartialView
: MacroTypes.Script;
}
return MacroTypes.Unknown;
if (!string.IsNullOrEmpty(scriptType) && scriptType.ToLower().IndexOf(".ascx") > -1)
return MacroTypes.UserControl;
if (!string.IsNullOrEmpty(scriptType) && !string.IsNullOrEmpty(scriptAssembly))
return MacroTypes.CustomControl;
return MacroTypes.Unknown;
}
public static string GenerateCacheKeyFromCode(string input)

3
src/umbraco.cms/businesslogic/macro/MacroTypes.cs
View File

@@ -7,6 +7,7 @@ namespace umbraco.cms.businesslogic.macro
UserControl = 3,
Unknown = 4,
Python = 5,
Script = 6
Script = 6,
PartialView = 7
}
}