From b55ce96d85acbab1dacb394efa96e529f38d8ae2 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Mon, 8 Oct 2012 07:12:02 -0200 Subject: [PATCH 1/2] Changes to editView, editTemplate and loadTemplates to fix wrong create dialog, and missing master pre-selection in master template dropdown --- .../umbraco/settings/views/EditView.aspx.cs | 10 +++++----- .../umbraco/Trees/loadTemplates.cs | 7 +------ .../umbraco/settings/editTemplate.aspx.cs | 14 ++------------ 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs index 6287469773..4abc1c8731 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs @@ -56,13 +56,13 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views var li = new ListItem(t.Text, t.Id.ToString()); li.Attributes.Add("id", t.Alias.Replace(" ", "")); - - if (t.Id == _template.MasterTemplate) - selectedTemplate = t.Alias.Replace(" ", ""); - - MasterTemplate.Items.Add(li); + MasterTemplate.Items.Add(li); } + if (_template.MasterTemplate > 0) + MasterTemplate.SelectedValue = _template.MasterTemplate.ToString(); + + MasterTemplate.SelectedValue = selectedTemplate; NameTxt.Text = _template.GetRawText(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index 97a6c11a0f..f5e7ac9642 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -36,12 +36,7 @@ namespace umbraco protected override void CreateRootNode(ref XmlTreeNode rootNode) { - if (!Umbraco.Core.Configuration.UmbracoSettings.EnableMvcSupport) - rootNode.NodeType = "init" + TreeAlias; - else - rootNode.NodeType = "initviews"; - - + rootNode.NodeType = "init" + TreeAlias; rootNode.NodeID = "init"; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index 73dff11fff..73852de242 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -50,19 +50,7 @@ namespace umbraco.cms.presentation.settings if (t.Id != _template.Id) { var li = new ListItem(t.Text, t.Id.ToString()); - li.Attributes.Add("id", t.Alias.Replace(" ", "")); - - if (t.Id == _template.MasterTemplate) - { - try - { - li.Selected = true; - } - catch - { - } - } MasterTemplate.Items.Add(li); } } @@ -71,6 +59,8 @@ namespace umbraco.cms.presentation.settings AliasTxt.Text = _template.Alias; editorSource.Text = _template.Design; + if(_template.MasterTemplate > 0) + MasterTemplate.SelectedValue = _template.MasterTemplate.ToString(); ClientTools .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias) From 458de6296e0e994e90396a3c7308ec79ed8668ce Mon Sep 17 00:00:00 2001 From: PerPloug Date: Mon, 8 Oct 2012 07:19:36 -0200 Subject: [PATCH 2/2] Wraps masterpages selector in try/catch to avoid exceptions if masterpage is missing for some reason --- .../umbraco/settings/views/EditView.aspx.cs | 13 +++++++++---- .../umbraco/settings/editTemplate.aspx.cs | 10 ++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs index 4abc1c8731..3ead9903c4 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs @@ -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; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index 73852de242..026cb7d137 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -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().Tree.Alias)