Skip to content

Commit 38e2324

Browse files
AdrienSyProAdrienSyPro
committed
PROGX-837: fix conflict
1 parent a527aab commit 38e2324

File tree

3 files changed

+103
-57
lines changed

3 files changed

+103
-57
lines changed

‎content/openapi/openapi.json‎

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,13 +2223,12 @@
22232223
{
22242224
"in": "query",
22252225
"name": "create_missing_options",
2226-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
2226+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
22272227
"required": false,
22282228
"schema": {
2229-
"type": "string",
2230-
"default": "no value"
2229+
"type": "string"
22312230
},
2232-
"example": "no value"
2231+
"example": ""
22332232
}
22342233
],
22352234
"requestBody": {
@@ -3300,13 +3299,12 @@
33003299
{
33013300
"in": "query",
33023301
"name": "create_missing_options",
3303-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
3302+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
33043303
"required": false,
33053304
"schema": {
3306-
"type": "string",
3307-
"default": "no value"
3305+
"type": "string"
33083306
},
3309-
"example": "no value"
3307+
"example": ""
33103308
}
33113309
],
33123310
"x-body-by-line": "Contains several lines, each line is a product in JSON standard format.\nModifications to existing products can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -7341,6 +7339,16 @@
73417339
"format": "uuid"
73427340
},
73437341
"example": "123e4567-e89b-12d3-a456-426614174000"
7342+
},
7343+
{
7344+
"in": "query",
7345+
"name": "create_missing_options",
7346+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
7347+
"required": false,
7348+
"schema": {
7349+
"type": "string"
7350+
},
7351+
"example": ""
73447352
}
73457353
],
73467354
"requestBody": {
@@ -11953,13 +11961,12 @@
1195311961
{
1195411962
"in": "query",
1195511963
"name": "create_missing_options",
11956-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
11964+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1195711965
"required": false,
1195811966
"schema": {
11959-
"type": "string",
11960-
"default": "no value"
11967+
"type": "string"
1196111968
},
11962-
"example": "no value"
11969+
"example": ""
1196311970
}
1196411971
],
1196511972
"requestBody": {
@@ -13077,13 +13084,12 @@
1307713084
{
1307813085
"in": "query",
1307913086
"name": "create_missing_options",
13080-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
13087+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1308113088
"required": false,
1308213089
"schema": {
13083-
"type": "string",
13084-
"default": "no value"
13090+
"type": "string"
1308513091
},
13086-
"example": "no value"
13092+
"example": ""
1308713093
}
1308813094
],
1308913095
"x-body-by-line": "Contains several lines, each line is a product model in JSON standard format.\nModifications to existing product models can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -15201,6 +15207,16 @@
1520115207
"type": "string"
1520215208
},
1520315209
"example": "my_entity_code"
15210+
},
15211+
{
15212+
"in": "query",
15213+
"name": "create_missing_options",
15214+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
15215+
"required": false,
15216+
"schema": {
15217+
"type": "string"
15218+
},
15219+
"example": ""
1520415220
}
1520515221
],
1520615222
"requestBody": {
@@ -19526,13 +19542,12 @@
1952619542
{
1952719543
"in": "query",
1952819544
"name": "create_missing_options",
19529-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
19545+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1953019546
"required": false,
1953119547
"schema": {
19532-
"type": "string",
19533-
"default": "no value"
19548+
"type": "string"
1953419549
},
19535-
"example": "no value"
19550+
"example": ""
1953619551
}
1953719552
],
1953819553
"requestBody": {
@@ -20503,13 +20518,12 @@
2050320518
{
2050420519
"in": "query",
2050520520
"name": "create_missing_options",
20506-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
20521+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
2050720522
"required": false,
2050820523
"schema": {
20509-
"type": "string",
20510-
"default": "no value"
20524+
"type": "string"
2051120525
},
20512-
"example": "no value"
20526+
"example": ""
2051320527
}
2051420528
],
2051520529
"x-body-by-line": "Contains several lines, each line is a product model in JSON standard format.\nModifications to existing product models can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -22286,6 +22300,16 @@
2228622300
"type": "string"
2228722301
},
2228822302
"example": "my_entity_code"
22303+
},
22304+
{
22305+
"in": "query",
22306+
"name": "create_missing_options",
22307+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
22308+
"required": false,
22309+
"schema": {
22310+
"type": "string"
22311+
},
22312+
"example": ""
2228922313
}
2229022314
],
2229122315
"requestBody": {
@@ -65451,13 +65475,12 @@
6545165475
"create_missing_options": {
6545265476
"in": "query",
6545365477
"name": "create_missing_options",
65454-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
65478+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
6545565479
"required": false,
6545665480
"schema": {
65457-
"type": "string",
65458-
"default": "no value"
65481+
"type": "string"
6545965482
},
65460-
"example": "no value"
65483+
"example": ""
6546165484
},
6546265485
"uuid": {
6546365486
"in": "path",

‎content/swagger/akeneo-web-api.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎content/swagger/openapi.json‎

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,13 +2223,12 @@
22232223
{
22242224
"in": "query",
22252225
"name": "create_missing_options",
2226-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
2226+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
22272227
"required": false,
22282228
"schema": {
2229-
"type": "string",
2230-
"default": "no value"
2229+
"type": "string"
22312230
},
2232-
"example": "no value"
2231+
"example": ""
22332232
}
22342233
],
22352234
"requestBody": {
@@ -3300,13 +3299,12 @@
33003299
{
33013300
"in": "query",
33023301
"name": "create_missing_options",
3303-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
3302+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
33043303
"required": false,
33053304
"schema": {
3306-
"type": "string",
3307-
"default": "no value"
3305+
"type": "string"
33083306
},
3309-
"example": "no value"
3307+
"example": ""
33103308
}
33113309
],
33123310
"x-body-by-line": "Contains several lines, each line is a product in JSON standard format.\nModifications to existing products can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -7341,6 +7339,16 @@
73417339
"format": "uuid"
73427340
},
73437341
"example": "123e4567-e89b-12d3-a456-426614174000"
7342+
},
7343+
{
7344+
"in": "query",
7345+
"name": "create_missing_options",
7346+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
7347+
"required": false,
7348+
"schema": {
7349+
"type": "string"
7350+
},
7351+
"example": ""
73447352
}
73457353
],
73467354
"requestBody": {
@@ -11953,13 +11961,12 @@
1195311961
{
1195411962
"in": "query",
1195511963
"name": "create_missing_options",
11956-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
11964+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1195711965
"required": false,
1195811966
"schema": {
11959-
"type": "string",
11960-
"default": "no value"
11967+
"type": "string"
1196111968
},
11962-
"example": "no value"
11969+
"example": ""
1196311970
}
1196411971
],
1196511972
"requestBody": {
@@ -13077,13 +13084,12 @@
1307713084
{
1307813085
"in": "query",
1307913086
"name": "create_missing_options",
13080-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
13087+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1308113088
"required": false,
1308213089
"schema": {
13083-
"type": "string",
13084-
"default": "no value"
13090+
"type": "string"
1308513091
},
13086-
"example": "no value"
13092+
"example": ""
1308713093
}
1308813094
],
1308913095
"x-body-by-line": "Contains several lines, each line is a product model in JSON standard format.\nModifications to existing product models can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -15201,6 +15207,16 @@
1520115207
"type": "string"
1520215208
},
1520315209
"example": "my_entity_code"
15210+
},
15211+
{
15212+
"in": "query",
15213+
"name": "create_missing_options",
15214+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
15215+
"required": false,
15216+
"schema": {
15217+
"type": "string"
15218+
},
15219+
"example": ""
1520415220
}
1520515221
],
1520615222
"requestBody": {
@@ -19526,13 +19542,12 @@
1952619542
{
1952719543
"in": "query",
1952819544
"name": "create_missing_options",
19529-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
19545+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
1953019546
"required": false,
1953119547
"schema": {
19532-
"type": "string",
19533-
"default": "no value"
19548+
"type": "string"
1953419549
},
19535-
"example": "no value"
19550+
"example": ""
1953619551
}
1953719552
],
1953819553
"requestBody": {
@@ -20503,13 +20518,12 @@
2050320518
{
2050420519
"in": "query",
2050520520
"name": "create_missing_options",
20506-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
20521+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
2050720522
"required": false,
2050820523
"schema": {
20509-
"type": "string",
20510-
"default": "no value"
20524+
"type": "string"
2051120525
},
20512-
"example": "no value"
20526+
"example": ""
2051320527
}
2051420528
],
2051520529
"x-body-by-line": "Contains several lines, each line is a product model in JSON standard format.\nModifications to existing product models can be specified using additional keys such as `add_categories` and `remove_categories`.\n",
@@ -22286,6 +22300,16 @@
2228622300
"type": "string"
2228722301
},
2228822302
"example": "my_entity_code"
22303+
},
22304+
{
22305+
"in": "query",
22306+
"name": "create_missing_options",
22307+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
22308+
"required": false,
22309+
"schema": {
22310+
"type": "string"
22311+
},
22312+
"example": ""
2228922313
}
2229022314
],
2229122315
"requestBody": {
@@ -65451,13 +65475,12 @@
6545165475
"create_missing_options": {
6545265476
"in": "query",
6545365477
"name": "create_missing_options",
65454-
"description": "Optional parameter to allow for the creation of missing options for attribute allowing it",
65478+
"description": "When present in the query string (regardless of value), automatically creates missing attribute options during product/product model creation or update.\nThis only works for simple select and multi select attributes that have the `enable_option_creation_during_import` property set to `true` (configurable via the Attribute API).\n",
6545565479
"required": false,
6545665480
"schema": {
65457-
"type": "string",
65458-
"default": "no value"
65481+
"type": "string"
6545965482
},
65460-
"example": "no value"
65483+
"example": ""
6546165484
},
6546265485
"uuid": {
6546365486
"in": "path",

0 commit comments

Comments
 (0)