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

hack until we fix template generation for when MB is disabled

Browse Source
This commit is contained in:
Shannon
2016-01-15 18:02:31 +01:00
parent 2bc0f0c6b4
commit 283b893128
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Web/Editors/ContentTypeController.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Net;
using System.Web.Http;
@@ -10,6 +11,7 @@ using Constants = Umbraco.Core.Constants;
using Umbraco.Core.Services;
using Umbraco.Core.PropertyEditors;
using System.Net.Http;
using umbraco;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.Strings;
@@ -175,29 +177,40 @@ namespace Umbraco.Web.Editors
public ContentTypeDisplay PostSave(ContentTypeSave contentTypeSave)
{
var savedCt = PerformPostSave<IContentType, ContentTypeDisplay>(
contentTypeSave: contentTypeSave,
getContentType: i => Services.ContentTypeService.GetContentType(i),
getContentTypeByAlias: alias => Services.ContentTypeService.GetContentType(alias),
saveContentType: type => Services.ContentTypeService.Save(type),
beforeCreateNew: ctSave =>
contentTypeSave: contentTypeSave,
getContentType: i => Services.ContentTypeService.GetContentType(i),
getContentTypeByAlias: alias => Services.ContentTypeService.GetContentType(alias),
saveContentType: type => Services.ContentTypeService.Save(type),
beforeCreateNew: ctSave =>
{
//create a default template if it doesnt exist -but only if default template is == to the content type
//TODO: Is this really what we want? What if we don't want any template assigned at all ?
if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
{
var template = Services.FileService.GetTemplate(ctSave.Alias);
if (template == null)
{
//ensure is safe and always pascal cased, per razor standard
var classname = ctSave.Name.ToCleanString(CleanStringType.Alias | CleanStringType.PascalCase);
string className = null;
//TODO: HACK until this is done: http://issues.umbraco.org/issue/U4-7747
bool enabled = false;
if (ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"] != null &&
bool.TryParse(ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"], out enabled)
&& enabled)
{
//ensure is safe and always pascal cased, per razor standard
className = ctSave.Name.ToCleanString(CleanStringType.Alias | CleanStringType.PascalCase);
}
template = new Template(ctSave.Name, ctSave.Alias);
template.Content = ViewHelper.GetDefaultFileContent(modelClassName: classname);
template.Content = ViewHelper.GetDefaultFileContent(modelClassName: className);
Services.FileService.SaveTemplate(template);
}
//make sure the template alias is set on the default and allowed template so we can map it back
ctSave.DefaultTemplate = template.Alias;
}
});