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

U4-2317 - issue with domains & languages management

Browse Source
This commit is contained in:
Stephan
2014-01-30 16:18:06 +01:00
parent 56cd1cee81
commit 2ab1cf59a6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,12 +64,14 @@ namespace Umbraco.Web.WebServices
// process domains
foreach (var domain in domains.Where(d => model.Domains.All(m => !m.Name.Equals(d.Name, StringComparison.OrdinalIgnoreCase))))
// delete every (non-wildcard) domain, that exists in the DB yet is not in the model
foreach (var domain in domains.Where(d => d.IsWildcard == false && model.Domains.All(m => m.Name.Equals(d.Name, StringComparison.OrdinalIgnoreCase) == false)))
domain.Delete();
var names = new List<string>();
foreach (var domainModel in model.Domains.Where(m => !string.IsNullOrWhiteSpace(m.Name)))
// create or update domains in the model
foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
{
language = languages.FirstOrDefault(l => l.id == domainModel.Lang);
if (language == null)
@@ -90,7 +92,7 @@ namespace Umbraco.Web.WebServices
Domain.MakeNew(name, model.NodeId, domainModel.Lang);
}
model.Valid = model.Domains.All(m => !m.Duplicate);
model.Valid = model.Domains.All(m => m.Duplicate == false);
return model;
}