diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-11 03:37:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-11 03:37:37 +0200 |
| commit | adfad74f8ad345629397b0b702d5aa84a85a1bfc (patch) | |
| tree | 4bc8d2ac38d1e2bd52536b06a8e49ace3b774430 | |
| parent | 34bc80f07d84ee72b60604742a323ef93b53f6bc (diff) | |
| parent | 855939d5bbb466214bdafe677ce4c0b7b15fd332 (diff) | |
| download | Ishtar-adfad74f8ad345629397b0b702d5aa84a85a1bfc.tar.bz2 Ishtar-adfad74f8ad345629397b0b702d5aa84a85a1bfc.zip | |
Merge branch 'stable'
| -rw-r--r-- | Makefile.example | 1 | ||||
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/Makefile.example b/Makefile.example index 29ba7cb56..130318d36 100644 --- a/Makefile.example +++ b/Makefile.example @@ -123,6 +123,7 @@ fixtures_common_importers: ishtar_common.importercolumn \ ishtar_common.importtarget \ ishtar_common.formatertype \ + ishtar_common.importerduplicatefield \ > '../ishtar_common/fixtures/initial_importtypes-'$(default_data)'.json' fixtures_common_towns: diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 4cb490128..92a0c10d7 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -1372,5 +1372,37 @@ "many_split": "", "options": "%Y" } + }, + { + "pk": 1, + "model": "ishtar_common.importerduplicatefield", + "fields": { + "column": 37, + "field_name": "find__external_id" + } + }, + { + "pk": 2, + "model": "ishtar_common.importerduplicatefield", + "fields": { + "column": 37, + "field_name": "label" + } + }, + { + "pk": 3, + "model": "ishtar_common.importerduplicatefield", + "fields": { + "column": 37, + "field_name": "find__label" + } + }, + { + "pk": 4, + "model": "ishtar_common.importerduplicatefield", + "fields": { + "column": 10, + "field_name": "external_id" + } } ]
\ No newline at end of file |