Skip to content

Commit

Permalink
Merge branch '4.0' into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@aryaantony92
aryaantony92 committed Aug 21, 2023
2 parents bbffbd9 + de98f9e commit ffc827a
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 58 deletions.
14 changes: 6 additions & 8 deletions install/class_source/class_CustomerSegmentGroup_export.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"allowInherit": false,
"allowVariants": false,
"showVariants": false,
"generateTypeDeclarations": true,
"layoutDefinitions": {
"fieldtype": "panel",
"labelWidth": 100,
Expand Down Expand Up @@ -66,7 +65,7 @@
"tooltip": "",
"mandatory": true,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -107,7 +106,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": true,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -128,7 +127,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": true,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -167,7 +166,7 @@
"tooltip": "Show segment group as filter on customer view",
"mandatory": false,
"noteditable": false,
"index": 1,
"index": true,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -196,7 +195,7 @@
"tooltip": "Set sort order for field. Higher numbers for sort order will have higher priority.",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -217,7 +216,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -237,7 +236,6 @@
"locked": false
},
"icon": "\/bundles\/pimcorecustomermanagementframework\/icons\/segment-group.svg",
"previewUrl": null,
"group": "CustomerManagement",
"propertyVisibility": {
"grid": {
Expand Down
14 changes: 6 additions & 8 deletions install/class_source/class_CustomerSegment_export.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -111,7 +111,7 @@
"tooltip": "Drag and drop segment into groups in the tree",
"mandatory": false,
"noteditable": true,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -133,7 +133,7 @@
"tooltip": "needs to be unique within the group",
"mandatory": false,
"noteditable": true,
"index": 1,
"index": true,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -151,7 +151,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": true,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -169,7 +169,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -193,7 +193,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -213,12 +213,10 @@
"locked": false
},
"icon": "\/bundles\/pimcorecustomermanagementframework\/icons\/segment.svg",
"previewUrl": "",
"group": "CustomerManagement",
"showAppLoggerTab": false,
"linkGeneratorReference": "",
"compositeIndices": [],
"generateTypeDeclarations": true,
"showFieldLookup": false,
"propertyVisibility": {
"grid": {
Expand Down
29 changes: 14 additions & 15 deletions install/class_source/class_LinkActivityDefinition_export.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"allowInherit": true,
"allowVariants": false,
"showVariants": false,
"generateTypeDeclarations": true,
"layoutDefinitions": {
"fieldtype": "panel",
"labelWidth": 100,
Expand Down Expand Up @@ -76,7 +75,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": true,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -138,7 +137,7 @@
"tooltip": "",
"mandatory": true,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -165,7 +164,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -186,7 +185,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -222,7 +221,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -270,7 +269,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -297,7 +296,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -324,7 +323,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -351,7 +350,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -378,7 +377,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -442,7 +441,7 @@
"tooltip": "",
"mandatory": true,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "float: left; margin-right: 60px;",
"permissions": null,
Expand All @@ -469,7 +468,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "float:left;",
"permissions": null,
Expand All @@ -492,7 +491,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -511,10 +510,10 @@
"icon": null
},
"icon": "\/bundles\/pimcoreadmin\/img\/flat-color-icons\/sports_mode.svg",
"previewUrl": "\/__customermanagementframework\/object-preview\/link-activity-definition-preview",
"group": "CustomerManagement",
"showAppLoggerTab": false,
"linkGeneratorReference": "@CustomerManagementFrameworkBundle\\LinkGenerator\\LinkActivityDefinitionLinkGenerator",
"previewGeneratorReference": "@CustomerManagementFrameworkBundle\\PreviewGenerator\\LinkActivityDefinitionPreviewGenerator",
"compositeIndices": [],
"showFieldLookup": false,
"propertyVisibility": {
Expand Down
10 changes: 4 additions & 6 deletions install/class_source/class_TermSegmentBuilderDefinition_export.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"allowInherit": false,
"allowVariants": false,
"showVariants": false,
"generateTypeDeclarations": true,
"layoutDefinitions": {
"fieldtype": "panel",
"labelWidth": 100,
Expand Down Expand Up @@ -51,7 +50,7 @@
"tooltip": "",
"mandatory": true,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand Down Expand Up @@ -84,7 +83,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -111,7 +110,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -129,7 +128,7 @@
"tooltip": "",
"mandatory": false,
"noteditable": false,
"index": null,
"index": false,
"locked": false,
"style": "",
"permissions": null,
Expand All @@ -146,7 +145,6 @@
"locked": false
},
"icon": "\/bundles\/pimcoreadmin\/img\/flat-color-icons\/data_configuration.svg",
"previewUrl": null,
"group": "CustomerManagement",
"propertyVisibility": {
"grid": {
Expand Down
Loading

0 comments on commit ffc827a

Please sign in to comment.