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

Adding SetDefaultTemplate on ContentType.

Browse Source 
Correcting UOW for FileService, which needs two providers - one for files and one for data.
This commit is contained in:
Morten Christensen
2012-11-12 07:16:54 -01:00
parent 4be2207f50
commit d0c79052e8
5 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Core/Models/ContentType.cs
View File

@@ -61,6 +61,21 @@ namespace Umbraco.Core.Models
}
}
/// <summary>
/// Sets the default template for the ContentType
/// </summary>
/// <param name="template">Default <see cref="ITemplate"/></param>
public void SetDefaultTemplate(ITemplate template)
{
DefaultTemplateId = template.Id;
if(_allowedTemplates.Any(x => x.Id == template.Id) == false)
{
var templates = AllowedTemplates.ToList();
templates.Add(template);
AllowedTemplates = templates;
}
}
/// <summary>
/// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
/// </summary>

6
src/Umbraco.Core/Models/IContentType.cs
View File

@@ -16,5 +16,11 @@ namespace Umbraco.Core.Models
/// Gets or Sets a list of Templates which are allowed for the ContentType
/// </summary>
IEnumerable<ITemplate> AllowedTemplates { get; set; }
/// <summary>
/// Sets the default template for the ContentType
/// </summary>
/// <param name="template">Default <see cref="ITemplate"/></param>
void SetDefaultTemplate(ITemplate template);
}
}

46
src/Umbraco.Web/Services/FileService.cs
View File

@@ -12,15 +12,17 @@ namespace Umbraco.Web.Services
/// </summary>
public class FileService : IFileService
{
private readonly IUnitOfWork _unitOfWork;
private readonly IUnitOfWork _fileUnitOfWork;
private readonly IUnitOfWork _dataUnitOfWork;
public FileService() : this(new FileUnitOfWorkProvider())
public FileService() : this(new FileUnitOfWorkProvider(), new PetaPocoUnitOfWorkProvider())
{
}
public FileService(IUnitOfWorkProvider provider)
public FileService(IUnitOfWorkProvider fileProvider, IUnitOfWorkProvider dataProvider)
{
_unitOfWork = provider.GetUnitOfWork();
_fileUnitOfWork = fileProvider.GetUnitOfWork();
_dataUnitOfWork = dataProvider.GetUnitOfWork();
}
/// <summary>
@@ -29,7 +31,7 @@ namespace Umbraco.Web.Services
/// <returns>An enumerable list of <see cref="Stylesheet"/> objects</returns>
public IEnumerable<Stylesheet> GetStylesheets(params string[] names)
{
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_fileUnitOfWork);
return repository.GetAll(names);
}
@@ -40,7 +42,7 @@ namespace Umbraco.Web.Services
/// <returns>A <see cref="Stylesheet"/> object</returns>
public Stylesheet GetStylesheetByName(string name)
{
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_fileUnitOfWork);
return repository.Get(name);
}
@@ -50,9 +52,9 @@ namespace Umbraco.Web.Services
/// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
public void SaveStylesheet(Stylesheet stylesheet)
{
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_fileUnitOfWork);
repository.AddOrUpdate(stylesheet);
_unitOfWork.Commit();
_fileUnitOfWork.Commit();
}
/// <summary>
@@ -61,10 +63,10 @@ namespace Umbraco.Web.Services
/// <param name="name">Name incl. extension of the Stylesheet to delete</param>
public void DeleteStylesheet(string name)
{
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IStylesheetRepository, Stylesheet, string>(_fileUnitOfWork);
var stylesheet = repository.Get(name);
repository.Delete(stylesheet);
_unitOfWork.Commit();
_fileUnitOfWork.Commit();
}
/// <summary>
@@ -83,7 +85,7 @@ namespace Umbraco.Web.Services
/// <returns>An enumerable list of <see cref="Script"/> objects</returns>
public IEnumerable<Script> GetScripts(params string[] names)
{
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_fileUnitOfWork);
return repository.GetAll(names);
}
@@ -94,7 +96,7 @@ namespace Umbraco.Web.Services
/// <returns>A <see cref="Script"/> object</returns>
public Script GetScriptByName(string name)
{
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_fileUnitOfWork);
return repository.Get(name);
}
@@ -104,9 +106,9 @@ namespace Umbraco.Web.Services
/// <param name="script"><see cref="Script"/> to save</param>
public void SaveScript(Script script)
{
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_fileUnitOfWork);
repository.AddOrUpdate(script);
_unitOfWork.Commit();
_fileUnitOfWork.Commit();
}
/// <summary>
@@ -115,10 +117,10 @@ namespace Umbraco.Web.Services
/// <param name="name">Name incl. extension of the Script to delete</param>
public void DeleteScript(string name)
{
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<IScriptRepository, Script, string>(_fileUnitOfWork);
var script = repository.Get(name);
repository.Delete(script);
_unitOfWork.Commit();
_fileUnitOfWork.Commit();
}
/// <summary>
@@ -137,7 +139,7 @@ namespace Umbraco.Web.Services
/// <returns>An enumerable list of <see cref="ITemplate"/> objects</returns>
public IEnumerable<ITemplate> GetTemplates(params string[] aliases)
{
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_dataUnitOfWork);
return repository.GetAll(aliases);
}
@@ -148,7 +150,7 @@ namespace Umbraco.Web.Services
/// <returns>A <see cref="Template"/> object</returns>
public ITemplate GetTemplateByAlias(string alias)
{
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_dataUnitOfWork);
return repository.Get(alias);
}
@@ -158,9 +160,9 @@ namespace Umbraco.Web.Services
/// <param name="template"><see cref="Template"/> to save</param>
public void SaveTemplate(ITemplate template)
{
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_dataUnitOfWork);
repository.AddOrUpdate(template);
_unitOfWork.Commit();
_dataUnitOfWork.Commit();
}
/// <summary>
@@ -169,10 +171,10 @@ namespace Umbraco.Web.Services
/// <param name="alias">Alias of the <see cref="ITemplate"/> to delete</param>
public void DeleteTemplate(string alias)
{
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_unitOfWork);
var repository = RepositoryResolver.ResolveByType<ITemplateRepository, ITemplate, int>(_dataUnitOfWork);
var template = repository.Get(alias);
repository.Delete(template);
_unitOfWork.Commit();
_dataUnitOfWork.Commit();
}
/// <summary>

2
src/Umbraco.Web/Services/ServiceContext.cs
View File

@@ -58,7 +58,7 @@ namespace Umbraco.Web.Services
var dataTypeService = new DataTypeService(provider);
_cache.AddOrUpdate(typeof(IDataTypeService).Name, dataTypeService, (x, y) => dataTypeService);
var fileService = new FileService(fileProvider);
var fileService = new FileService(fileProvider, provider);
_cache.AddOrUpdate(typeof(IFileService).Name, fileService, (x, y) => fileService);
var localizationService = new LocalizationService(provider);

8
src/Umbraco.Web/Services/ServiceFactory.cs
View File

@@ -63,5 +63,13 @@ namespace Umbraco.Web.Services
{
get { return ServiceContext.Current.MacroService; }
}
/// <summary>
/// Gets the <see cref="IUserService"/>
/// </summary>
internal static IUserService UserService
{
get { return ServiceContext.Current.UserService; }
}
}
}