Merge branch 'v8/8.2' into v8/dev
# Conflicts: # src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js # src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
This commit is contained in:
@@ -33,9 +33,6 @@ namespace Umbraco.Web.Models.ContentEditing
|
||||
[DataMember(Name = "hideLabel")]
|
||||
public bool HideLabel { get; set; }
|
||||
|
||||
[DataMember(Name = "canCopy")]
|
||||
public bool CanCopy { get; set; }
|
||||
|
||||
[DataMember(Name = "validation")]
|
||||
public PropertyTypeValidation Validation { get; set; }
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ namespace Umbraco.Web.Models.Mapping
|
||||
dest.Description = originalProp.PropertyType.Description;
|
||||
dest.Label = originalProp.PropertyType.Name;
|
||||
dest.HideLabel = valEditor.HideLabel;
|
||||
dest.CanCopy = valEditor.CanCopy;
|
||||
|
||||
//add the validation information
|
||||
dest.Validation.Mandatory = originalProp.PropertyType.Mandatory;
|
||||
|
||||
@@ -24,8 +24,7 @@ namespace Umbraco.Web.PropertyEditors
|
||||
"nestedcontent",
|
||||
ValueType = ValueTypes.Json,
|
||||
Group = Constants.PropertyEditors.Groups.Lists,
|
||||
Icon = "icon-thumbnail-list",
|
||||
CanCopy = true)]
|
||||
Icon = "icon-thumbnail-list")]
|
||||
public class NestedContentPropertyEditor : DataEditor
|
||||
{
|
||||
private readonly Lazy<PropertyEditorCollection> _propertyEditors;
|
||||
|
||||
Reference in New Issue
Block a user