feeder: add prefix to join's names of fields (#39373)

This commit is contained in:
Benjamin Dauvergne 2020-01-29 12:50:43 +01:00
parent 04ad4ee2d2
commit 8fc092f4d7
2 changed files with 9 additions and 9 deletions

View File

@ -254,13 +254,13 @@
{
"filter" : true,
"join" : [
"item"
"join_item"
],
"label" : "2nd field",
"name" : "item",
"type" : "integer",
"value" : "\"item\".id",
"value_label" : "\"item\".label"
"value" : "\"join_item\".id",
"value_label" : "\"join_item\".label"
},
{
"filter": true,
@ -273,13 +273,13 @@
{
"filter" : true,
"join" : [
"itemOpen"
"join_itemOpen"
],
"label" : "4rth field",
"name" : "itemOpen",
"type" : "integer",
"value" : "\"itemOpen\".id",
"value_label" : "\"itemOpen\".label"
"value" : "\"join_itemOpen\".id",
"value_label" : "\"join_itemOpen\".label"
},
{
"filter": true,
@ -359,14 +359,14 @@
{
"detail" : "id",
"master" : "\"field_item\"",
"name" : "item",
"name" : "join_item",
"table" : "\"formdata_demande_field_item\"",
"kind" : "left"
},
{
"detail" : "id",
"master" : "\"field_itemOpen\"",
"name" : "itemOpen",
"name" : "join_itemOpen",
"table" : "\"formdata_demande_field_itemOpen\"",
"kind" : "left"
}

View File

@ -963,7 +963,7 @@ class WcsFormdefFeeder(object):
for field in good_fields.values():
join = None
join_name = field.varname
join_name = 'join_' + field.varname
field_name = 'field_%s' % field.varname
dimension_name = field.varname
dimension_label = field.label.lower()