Skip to content

Commit

Permalink
Merge pull request #3499 from 2sic/develop
Browse files Browse the repository at this point in the history 
18.03
  • Loading branch information
@iJungleboy
iJungleboy authored Nov 5, 2024
2 parents 22ba4a4 + b507cb1 commit da5621e
Show file tree
Hide file tree
Showing 251 changed files with 3,678 additions and 2,224 deletions.
783 changes: 537 additions & 246 deletions Src/Data/App_Data/system/bundles/system-datasources.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Src/Data/App_Data/system/bundles/system-decorators.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,7 @@
"Metadata": [
{
"Id": 183822,
"Version": 2,
"Version": 3,
"Guid": "dcc4368d-49f3-4907-ab25-b1e245547365",
"Type": {
"Id": "@All",
Expand All @@ -1864,7 +1864,7 @@
"de-de": "Lightbox / PopUp Einstellungen"
},
"Notes": {
"en-us": ""
"en-us": "<p>For help, see&nbsp;<a href=\"https://go.2sxc.org/image-lightbox\">docs</a>.</p>"
},
"Placeholder": {
"en-us": ""
Expand Down Expand Up @@ -1903,7 +1903,7 @@
},
{
"Id": 183825,
"Version": 1,
"Version": 2,
"Guid": "4e3ec7ee-5211-41de-b921-6f520f1f8d2c",
"Type": {
"Id": "@empty-default",
Expand Down
86 changes: 58 additions & 28 deletions Src/Data/App_Data/system/bundles/system-fields-pickers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
"Metadata": [
{
"Id": 128428,
"Version": 3,
"Version": 5,
"Guid": "487df46d-3ec2-4d53-87a7-c0e02a182340",
"Type": {
"Id": "@All",
Expand All @@ -729,7 +729,7 @@
"en-us": "Experimental / Beta Features"
},
"Notes": {
"en-us": "<p>These features are not final, so you should only use them with caution and the way they are configured may still change.&nbsp;</p>"
"en-us": "<p>These features are not final, so you should only use them with caution and the way they are configured may still change.&nbsp;</p>\n<p>We recommend that you use the entity-picker and that prefill instead.&nbsp;</p>"
},
"Placeholder": {
"en-us": ""
Expand All @@ -743,7 +743,9 @@
"*": []
},
"Formulas": {
"*": []
"*": [
"27ffdc8c-2054-4ec0-a4f6-14517d27b71c"
]
},
"Warnings": {
"*": []
Expand All @@ -768,7 +770,7 @@
},
{
"Id": 128429,
"Version": 2,
"Version": 3,
"Guid": "a1db0df3-753a-4d72-888a-a99c53105b48",
"Type": {
"Id": "@empty-default",
Expand Down Expand Up @@ -950,6 +952,34 @@
}
},
"Owner": "dnn:userid=41"
},
{
"Id": 184083,
"Version": 2,
"Guid": "27ffdc8c-2054-4ec0-a4f6-14517d27b71c",
"Type": {
"Id": "772dfff1-b236-4aa9-8359-5f53c08ff7bf",
"Name": "UiFormula"
},
"Attributes": {
"String": {
"Formula": {
"en-us": "v2((data, context) => {\n return context.debug;\n});"
},
"Target": {
"en-us": "Field.Settings.Visible"
},
"Title": {
"en-us": "Field.Settings.Visible"
}
},
"Boolean": {
"Enabled": {
"en-us": true
}
}
},
"Owner": "dnn:userid=41"
}
]
},
Expand Down Expand Up @@ -7080,7 +7110,7 @@
},
{
"Id": 183964,
"Version": 2,
"Version": 3,
"Guid": "839f7aef-a5f2-4fa2-8065-30eb78e267ac",
"Type": {
"Id": "5f8e3968-e02b-40d5-ab77-f60c2e73d244",
Expand All @@ -7104,7 +7134,7 @@
"en-us": ""
},
"ItemTooltip": {
"en-us": ""
"en-us": "<p>[Item:Description]</p>"
},
"Label": {
"en-us": "Title"
Expand Down Expand Up @@ -13486,7 +13516,7 @@
},
{
"Id": 183718,
"Version": 4,
"Version": 6,
"Guid": "e457872b-90e7-4041-a8de-07bb88ddd43e",
"Type": {
"Id": "772dfff1-b236-4aa9-8359-5f53c08ff7bf",
Expand All @@ -13495,7 +13525,7 @@
"Attributes": {
"String": {
"Formula": {
"en-us": "v2((data, context) => {\n const typeName = context.target.entity.type.name;\n // For custom list, it can always be visible\n if (typeName == \"UiPickerSourceCustomList\" || typeName == \"UiPickerSourceCustomCsv\") {\n // console.log('custom list - show by default');\n return true;\n }\n\n // For Entity Picker\n if (typeName == \"UiPickerSourceEntity\") {\n // console.log('entity source');\n return data.ContentTypeNames.length > 0;\n }\n\n if (typeName == \"UiPickerSourceQuery\") {\n // console.log('2dm query source');\n return data.Query.length > 0;\n }\n\n console.warn('formula for GroupItemHelp is running on an unexpected type: ' + typeName);\n // console.log('2dm data', data, context);\n return data.value;\n});"
"en-us": "v2((data, context) => {\n const typeName = context.target.entity.type.name;\n // For custom list, it can always be visible\n if (typeName == 'UiPickerSourceCustomList'\n || typeName == 'UiPickerSourceCustomCsv'\n || typeName == 'UiPickerSourceAppAssets'\n ) {\n return true;\n }\n\n // For Entity Picker\n if (typeName == \"UiPickerSourceEntity\") {\n return data.ContentTypeNames.length > 0;\n }\n\n if (typeName == \"UiPickerSourceQuery\") {\n return data.Query.length > 0;\n }\n\n // Warn on unknown type, as it can't determine how to set visibility\n console.warn('formula for GroupItemHelp is running on an unexpected type, so it is not clear when to show/hide: ' + typeName);\n // console.log('2dm data', data, context);\n return data.value;\n});"
},
"Notes": {
"en-us": ""
Expand Down Expand Up @@ -14216,22 +14246,6 @@
"Name": "UiPickerSourceCss",
"Scope": "System.Fields",
"Metadata": [
{
"Id": 183952,
"Version": 1,
"Guid": "01c78465-f078-4978-9eee-ec5d88599660",
"Type": {
"Id": "bcce96be-a439-4f22-9d1e-a10487544fa5",
"Name": "IsPickerSourceDecorator"
},
"Attributes": {},
"Owner": "dnn:userid=41",
"For": {
"Target": "ContentType",
"TargetType": 5,
"String": "78451625-053f-4e23-b4e8-e95c3fcf3320"
}
},
{
"Id": 183928,
"Version": 3,
Expand Down Expand Up @@ -14279,6 +14293,22 @@
"TargetType": 5,
"String": "78451625-053f-4e23-b4e8-e95c3fcf3320"
}
},
{
"Id": 183952,
"Version": 1,
"Guid": "01c78465-f078-4978-9eee-ec5d88599660",
"Type": {
"Id": "bcce96be-a439-4f22-9d1e-a10487544fa5",
"Name": "IsPickerSourceDecorator"
},
"Attributes": {},
"Owner": "dnn:userid=41",
"For": {
"Target": "ContentType",
"TargetType": 5,
"String": "78451625-053f-4e23-b4e8-e95c3fcf3320"
}
}
],
"Attributes": [
Expand Down Expand Up @@ -16343,7 +16373,7 @@
},
{
"Id": 184038,
"Version": 2,
"Version": 5,
"Guid": "e13e0514-2606-48ae-b77c-fd5ed9b9a602",
"Type": {
"Id": "5f8e3968-e02b-40d5-ab77-f60c2e73d244",
Expand Down Expand Up @@ -16382,7 +16412,7 @@
"en-us": ""
},
"StreamName": {
"en-us": "Default"
"en-us": "Folders"
},
"Title": {
"en-us": "AppAssets - App Folders"
Expand Down Expand Up @@ -16509,7 +16539,7 @@
},
{
"Id": 184070,
"Version": 3,
"Version": 4,
"Guid": "a617f624-315d-41dc-b433-faf7924f64f1",
"Type": {
"Id": "5f8e3968-e02b-40d5-ab77-f60c2e73d244",
Expand All @@ -16530,7 +16560,7 @@
"en-us": ""
},
"ItemInformation": {
"en-us": ""
"en-us": "<p>[Item:Description]</p>"
},
"ItemTooltip": {
"en-us": ""
Expand Down
Loading

0 comments on commit da5621e

Please sign in to comment.