diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-30 10:23:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-30 10:23:12 +0100 |
| commit | 08240fc28fdcd4dd916229e75759b1f1988455ba (patch) | |
| tree | d81c85d1b433ed3c0a658f95b1841784789e7c8a /Makefile.example | |
| parent | 2cb20872730f20d1a0d73c321f269a754ffb5893 (diff) | |
| parent | b05763543d0984826715820edf7c59a2a65763e8 (diff) | |
| download | Ishtar-08240fc28fdcd4dd916229e75759b1f1988455ba.tar.bz2 Ishtar-08240fc28fdcd4dd916229e75759b1f1988455ba.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.example b/Makefile.example index c3b40b6df..95e7121a2 100644 --- a/Makefile.example +++ b/Makefile.example @@ -143,11 +143,13 @@ fixtures_common_importers: > '../ishtar_common/fixtures/initial_importtypes-'$(default_data)'.json' fixtures_common_towns: - cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ - ishtar_common.state \ + cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ ishtar_common.department \ ishtar_common.town \ - > '../ishtar_common/fixtures/initial_towns-'$(default_data)'.json' + > '../ishtar_common/fixtures/towns-'$(default_data)'.json' + cat 'ishtar_common/fixtures/towns-'$(default_data)'.json' | tr '\n' '\r' | \ + sed -e 's/"children": *\[\r *\[\r *"[0-9]*", *\r *[0-9]*\ *\r *\]\r *\]/"children": []/g' | \ + tr '\r' '\n' > 'ishtar_common/fixtures/towns_norel-'$(default_data)'.json' fixtures_spatialrefsystem: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ |