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

Remove icon from property group

Browse Source
This commit is contained in:
Ronald Barendse
2021-06-30 14:49:10 +02:00
parent 68db8b9ea0
commit 3ce0949626
14 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs
View File

@@ -16,7 +16,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_16_0
// Add new columns
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "parentKey");
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "type");
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "icon");
// Create self-referencing foreign key
var foreignKeyName = "FK_" + PropertyTypeGroupDto.TableName + "_parentKey";

14
src/Umbraco.Core/Models/PropertyGroup.cs
View File

@@ -19,7 +19,6 @@ namespace Umbraco.Core.Models
private Guid? _parentKey;
private PropertyGroupType _type;
private string _name;
private string _icon;
private int _sortOrder;
private PropertyTypeCollection _propertyTypes;
@@ -76,19 +75,6 @@ namespace Umbraco.Core.Models
set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
}
/// <summary>
/// Gets or sets the icon of the group.
/// </summary>
/// <value>
/// The icon.
/// </value>
[DataMember]
public string Icon
{
get => _icon;
set => SetPropertyValueAndDetectChanges(value, ref _icon, nameof(Icon));
}
/// <summary>
/// Gets or sets the sort order of the group.
/// </summary>

4
src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs
View File

@@ -36,10 +36,6 @@ namespace Umbraco.Core.Persistence.Dtos
[ForeignKey(typeof(ContentTypeDto), Column = "nodeId")]
public int ContentTypeNodeId { get; set; }
[Column("icon")]
[NullSetting(NullSetting = NullSettings.Null)]
public string Icon { get; set; }
[Column("text")]
public string Text { get; set; }

2
src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
View File

@@ -37,7 +37,6 @@ namespace Umbraco.Core.Persistence.Factories
group.Key = groupDto.UniqueId;
group.ParentKey = groupDto.ParentKey;
group.Type = (PropertyGroupType)groupDto.Type;
group.Icon = groupDto.Icon;
group.Name = groupDto.Text;
group.SortOrder = groupDto.SortOrder;
@@ -111,7 +110,6 @@ namespace Umbraco.Core.Persistence.Factories
ParentKey = propertyGroup.ParentKey,
Type = (short)propertyGroup.Type,
ContentTypeNodeId = contentTypeId,
Icon = propertyGroup.Icon,
Text = propertyGroup.Name,
SortOrder = propertyGroup.SortOrder
};

1
src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs
View File

@@ -22,7 +22,6 @@ namespace Umbraco.Core.Persistence.Mappers
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.Key), nameof(PropertyTypeGroupDto.UniqueId));
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.ParentKey), nameof(PropertyTypeGroupDto.ParentKey));
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.Type), nameof(PropertyTypeGroupDto.Type));
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.Icon), nameof(PropertyTypeGroupDto.Icon));
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.Name), nameof(PropertyTypeGroupDto.Text));
DefineMap<PropertyGroup, PropertyTypeGroupDto>(nameof(PropertyGroup.SortOrder), nameof(PropertyTypeGroupDto.SortOrder));
}

1
src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
View File

@@ -275,7 +275,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
Key = dto.UniqueId,
ParentKey = dto.ParentKey,
Type = (PropertyGroupType)dto.Type,
Icon = dto.Icon,
Name = dto.Text,
SortOrder = dto.SortOrder
};

2
src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
View File

@@ -75,7 +75,7 @@
});
saveModel.groups = _.map(realGroups, function (g) {
var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'key', 'parentKey', 'type', 'icon');
var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'key', 'parentKey', 'type');
var realProperties = _.reject(g.properties, function (p) {
//do not include these properties

1
src/Umbraco.Web/Editors/DashboardController.cs
View File

@@ -218,7 +218,6 @@ namespace Umbraco.Web.Editors
Key = x.Key,
ParentKey = x.ParentKey,
Type = x.Type,
Icon = x.Icon,
Alias = x.Alias,
Label = x.Label,
Expanded = x.Expanded,

3
src/Umbraco.Web/Models/ContentEditing/PropertyGroupBasic.cs
View File

@@ -43,9 +43,6 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "type")]
public PropertyGroupType Type { get; set; }
[DataMember(Name = "icon")]
public string Icon { get; set; }
[Required]
[DataMember(Name = "name")]
public string Name { get; set; }

3
src/Umbraco.Web/Models/ContentEditing/Tab.cs
View File

@@ -23,9 +23,6 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "type")]
public PropertyGroupType Type { get; set; }
[DataMember(Name = "icon")]
public string Icon { get; set; }
[DataMember(Name = "active")]
public bool IsActive { get; set; }

1
src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
View File

@@ -39,7 +39,6 @@ namespace Umbraco.Web.Models.Mapping
target.Key = source.Key;
target.ParentKey = source.ParentKey;
target.Type = source.Type;
target.Icon = source.Icon;
target.IsActive = true;
target.Label = source.Name;
}

4
src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -304,7 +304,6 @@ namespace Umbraco.Web.Models.Mapping
target.Key = source.Key;
target.ParentKey = source.ParentKey;
target.Type = source.Type;
target.Icon = source.Icon;
target.Name = source.Name;
target.SortOrder = source.SortOrder;
}
@@ -318,7 +317,6 @@ namespace Umbraco.Web.Models.Mapping
target.Key = source.Key;
target.ParentKey = source.ParentKey;
target.Type = source.Type;
target.Icon = source.Icon;
target.Name = source.Name;
target.SortOrder = source.SortOrder;
}
@@ -332,7 +330,6 @@ namespace Umbraco.Web.Models.Mapping
target.Key = source.Key;
target.ParentKey = source.ParentKey;
target.Type = source.Type;
target.Icon = source.Icon;
target.Name = source.Name;
target.SortOrder = source.SortOrder;
@@ -349,7 +346,6 @@ namespace Umbraco.Web.Models.Mapping
target.Key = source.Key;
target.ParentKey = source.ParentKey;
target.Type = source.Type;
target.Icon = source.Icon;
target.Name = source.Name;
target.SortOrder = source.SortOrder;

2
src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
View File

@@ -78,7 +78,6 @@ namespace Umbraco.Web.Models.Mapping
Key = tab.Key,
ParentKey = tab.ParentKey,
Type = tab.Type,
Icon = tab.Icon,
Name = tab.Name,
SortOrder = tab.SortOrder,
Inherited = false,
@@ -107,7 +106,6 @@ namespace Umbraco.Web.Models.Mapping
Key = tab.Key,
ParentKey = tab.ParentKey,
Type = tab.Type,
Icon = tab.Icon,
Name = tab.Name,
SortOrder = tab.SortOrder,
Inherited = true,

1
src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
View File

@@ -161,7 +161,6 @@ namespace Umbraco.Web.Models.Mapping
Key = g.Key,
ParentKey = g.ParentKey,
Type = g.Type,
Icon = g.Icon,
Alias = g.Name,
Label = LocalizedTextService.UmbracoDictionaryTranslate(g.Name),
Properties = mappedProperties,