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

Wraps masterpages selector in try/catch

Browse Source 
to avoid exceptions if masterpage is missing for some reason
This commit is contained in:
PerPloug
2012-10-08 07:19:36 -02:00
parent b55ce96d85
commit 458de6296e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
View File

@@ -59,11 +59,16 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
MasterTemplate.Items.Add(li);
}
if (_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
try
{
if (_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
}
catch (Exception ex)
{
}
MasterTemplate.SelectedValue = selectedTemplate;
MasterTemplate.SelectedValue = selectedTemplate;
NameTxt.Text = _template.GetRawText();
AliasTxt.Text = _template.Alias;

10
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
View File

@@ -59,8 +59,14 @@ namespace umbraco.cms.presentation.settings
AliasTxt.Text = _template.Alias;
editorSource.Text = _template.Design;
if(_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
try
{
if (_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
}
catch (Exception ex)
{
}
ClientTools
.SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)