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

Removes unused code

Browse Source
This commit is contained in:
Shannon
2019-07-30 18:49:48 +10:00
parent b5b4ee79b4
commit 27bc309c55
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
View File

@@ -512,20 +512,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
foreach (var a in allPropertyDataDtos)
a.PropertyTypeDto = indexedPropertyTypeDtos[a.PropertyTypeId];
// prefetch configuration for tag properties
var tagEditors = new Dictionary<string, TagConfiguration>();
foreach (var propertyTypeDto in indexedPropertyTypeDtos.Values)
{
var editorAlias = propertyTypeDto.DataTypeDto.EditorAlias;
var editorAttribute = PropertyEditors[editorAlias].GetTagAttribute();
if (editorAttribute == null) continue;
var tagConfigurationSource = propertyTypeDto.DataTypeDto.Configuration;
var tagConfiguration = string.IsNullOrWhiteSpace(tagConfigurationSource)
? new TagConfiguration()
: JsonConvert.DeserializeObject<TagConfiguration>(tagConfigurationSource);
if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = editorAttribute.Delimiter;
tagEditors[editorAlias] = tagConfiguration;
}
//TODO: This logic was here but then we never used the data being passed to GetPropertyCollections, this will save a bit of CPU without it!
//// prefetch configuration for tag properties
//var tagEditors = new Dictionary<string, TagConfiguration>();
//foreach (var propertyTypeDto in indexedPropertyTypeDtos.Values)
//{
// var editorAlias = propertyTypeDto.DataTypeDto.EditorAlias;
// var editorAttribute = PropertyEditors[editorAlias].GetTagAttribute();
// if (editorAttribute == null) continue;
// var tagConfigurationSource = propertyTypeDto.DataTypeDto.Configuration;
// var tagConfiguration = string.IsNullOrWhiteSpace(tagConfigurationSource)
// ? new TagConfiguration()
// : JsonConvert.DeserializeObject<TagConfiguration>(tagConfigurationSource);
// if (tagConfiguration.Delimiter == default) tagConfiguration.Delimiter = editorAttribute.Delimiter;
// tagEditors[editorAlias] = tagConfiguration;
//}
// now we have
// - the definitions
@@ -533,10 +534,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
// - tag editors
// and we need to build the proper property collections
return GetPropertyCollections(temps, allPropertyDataDtos, tagEditors);
return GetPropertyCollections(temps, allPropertyDataDtos
/*, tagEditors*/);
}
private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos, Dictionary<string, TagConfiguration> tagConfigurations)
private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos
/*, Dictionary<string, TagConfiguration> tagConfigurations*/)
where T : class, IContentBase
{
var result = new Dictionary<int, PropertyCollection>();

3
src/Umbraco.Core/Services/Implement/ContentService.cs
View File

@@ -1139,9 +1139,6 @@ namespace Umbraco.Core.Services.Implement
if (publishing)
{
//TODO: Check if it's a culture being unpublished and that's why we are publishing the document. In that case
// we should check if the culture is already unpublished since it might be the user is trying to unpublish an already unpublished culture?
//determine cultures publishing/unpublishing which will be based on previous calls to content.PublishCulture and ClearPublishInfo
culturesUnpublishing = content.GetCulturesUnpublishing();
culturesPublishing = variesByCulture