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

making macro errors nicer to deal with

Browse Source 
improving the structure tab

[TFS Changeset #66063]
This commit is contained in:
slace
2010-05-11 05:27:28 +00:00
parent 727d1c6507
commit 70794482af
3 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
umbraco/presentation/Global.asax.cs
View File

@@ -14,21 +14,45 @@ namespace umbraco
/// </summary>
public class Global : HttpApplication
{
protected virtual void Session_Start(Object sender, EventArgs e)
{
if(GlobalSettings.EnableStat)
{
try
{
new Session();
}
catch(Exception state)
{
Log.Add(LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "Error initializing stat: " + state);
}
}
}
protected virtual void Application_Start(object sender, EventArgs e)
{
}
protected virtual void Session_Start(Object sender, EventArgs e)
{
if (GlobalSettings.EnableStat)
{
try
{
new Session();
}
catch (Exception state)
{
Log.Add(LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "Error initializing stat: " + state);
}
}
}
protected virtual void Application_BeginRequest(object sender, EventArgs e)
{
}
protected virtual void Application_AuthenticateRequest(object sender, EventArgs e)
{
}
protected virtual void Application_Error(object sender, EventArgs e)
{
}
protected virtual void Session_End(object sender, EventArgs e)
{
}
protected virtual void Application_End(Object sender, EventArgs e)
{

2
umbraco/presentation/macro.cs
View File

@@ -633,7 +633,7 @@ namespace umbraco
catch (Exception e)
{
// inner exception code by Daniel Lindström from SBBS.se
Exception ie = e.InnerException;
Exception ie = e;
while (ie != null)
{
HttpContext.Current.Trace.Warn("umbracoMacro InnerException", ie.Message, ie);

6
umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -11,6 +11,7 @@ using ClientDependency.Core;
using umbraco.cms.helpers;
using umbraco.IO;
using umbraco.presentation;
using umbraco.cms.businesslogic;
namespace umbraco.controls
{
@@ -199,17 +200,20 @@ namespace umbraco.controls
if (!Page.IsPostBack)
{
string chosenContentTypeIDs = "";
foreach (cms.businesslogic.ContentType ct in cType.GetAll())
ContentType[] contentTypes = cType.GetAll();
foreach (cms.businesslogic.ContentType ct in contentTypes.OrderBy(x => x.Text))
{
ListItem li = new ListItem(ct.Text, ct.Id.ToString());
dualAllowedContentTypes.Items.Add(li);
lstAllowedContentTypes.Items.Add(li);
foreach (int i in allowedIds)
{
if (i == ct.Id)
{
li.Selected = true;
chosenContentTypeIDs += ct.Id + ",";
}
}
}
dualAllowedContentTypes.Value = chosenContentTypeIDs;
}