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

Refactors IDomain model, simplifies it so that it doesn't contain references, simplifies the domain repository to no longer require lookups of content and languages, updates all other code referencing IDomain and now if a language lookup is required it is made when appropriate.

Browse Source
This commit is contained in:
Shannon
2015-07-27 12:53:09 +02:00
parent 00c13b9939
commit 16c9ca9e4b
23 changed files with 323 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/WebServices/DomainsApiController.cs
View File

@@ -54,14 +54,14 @@ namespace Umbraco.Web.WebServices
{
var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
if (wildcard != null)
wildcard.Language = language;
wildcard.LanguageId = language.Id;
else
{
// yet there is a race condition here...
var newDomain = new UmbracoDomain("*" + model.NodeId)
{
Language = Services.LocalizationService.GetLanguageById(model.Language),
RootContent = Services.ContentService.GetById(model.NodeId)
LanguageId = model.Language,
RootContentId = model.NodeId
};
Services.DomainService.Save(newDomain);
}
@@ -103,7 +103,7 @@ namespace Umbraco.Web.WebServices
names.Add(name);
var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
if (domain != null)
domain.Language = language;
domain.LanguageId = language.Id;
else if (Services.DomainService.Exists(domainModel.Name))
domainModel.Duplicate = true;
else
@@ -111,8 +111,8 @@ namespace Umbraco.Web.WebServices
// yet there is a race condition here...
var newDomain = new UmbracoDomain(name)
{
Language = Services.LocalizationService.GetLanguageById(domainModel.Lang),
RootContent = Services.ContentService.GetById(model.NodeId)
LanguageId = domainModel.Lang,
RootContentId = model.NodeId
};
Services.DomainService.Save(newDomain);
}