Merge remote-tracking branch 'origin/v11/dev' into v12/dev

# Conflicts:
#	version.json
This commit is contained in:
Bjarke Berg
2023-06-21 08:54:10 +02:00
3 changed files with 6 additions and 6 deletions

View File

@@ -11,9 +11,6 @@ jobs:
issues: write
pull-requests: write
steps:
- name: Install dependencies
run: |
npm install node-fetch@2
- name: Fetch random comment 🗣️ and add it to the PR
uses: actions/github-script@v6
with:
@@ -44,13 +41,13 @@ jobs:
});
} else {
console.log("Returned data not indicate success.");
if(response.status !== 200) {
console.log("Status code:", response.status)
}
console.log("Returned data:", data);
if(data === '') {
console.log("An empty response usually indicates that either no comment was found or the actor user was not eligible for getting an automated response (HQ users are not getting auto-responses).")
}

View File

@@ -14,6 +14,7 @@ public class EntityMapDefinition : IMapDefinition
public void DefineMaps(IUmbracoMapper mapper)
{
mapper.Define<IEntitySlim, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<IPropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<PropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<PropertyGroup, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<IUser, EntityBasic>((source, context) => new EntityBasic(), Map);
@@ -77,7 +78,7 @@ public class EntityMapDefinition : IMapDefinition
}
// Umbraco.Code.MapAll -Udi -Trashed
private static void Map(PropertyType source, EntityBasic target, MapperContext context)
private static void Map(IPropertyType source, EntityBasic target, MapperContext context)
{
target.Alias = source.Alias;
target.Icon = "icon-box";

View File

@@ -43,6 +43,8 @@ public class MultiUrlPickerPropertyEditor : DataEditor
SupportsReadOnly = true;
}
public override IPropertyIndexValueFactory PropertyIndexValueFactory { get; } = new NoopPropertyIndexValueFactory();
protected override IConfigurationEditor CreateConfigurationEditor() =>
new MultiUrlPickerConfigurationEditor(_ioHelper, _editorConfigurationParser);