diff options
| -rw-r--r-- | Makefile.example | 14 | ||||
| -rw-r--r-- | archaeological_context_records/tests.py | 4 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 5 |
4 files changed, 21 insertions, 4 deletions
diff --git a/Makefile.example b/Makefile.example index 2529c56f4..84325806b 100644 --- a/Makefile.example +++ b/Makefile.example @@ -158,9 +158,14 @@ fixtures_operations: archaeological_operations.acttype \ archaeological_operations.period \ archaeological_operations.remaintype \ - archaeological_operations.relationtype \ archaeological_operations.reportstate \ > '../archaeological_operations/fixtures/initial_data-'$(default_data)'.json' + cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ + archaeological_operations.relationtype \ + > '../archaeological_operations/fixtures/initial_data_relation_type-'$(default_data)'.json' + cat archaeological_operations/fixtures/initial_data_relation_type-$(default_data).json | tr '\n' '\r' | \ + sed -e 's/"inverse_relation": *\[\r *\"[-_a-z0-9]*\" *\r *\]/"inverse_relation": null/g' | \ + tr '\r' '\n' > archaeological_operations/fixtures/initial_data_relation_type_norel-'$(default_data)'.json fixtures_context_records: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ @@ -169,10 +174,15 @@ fixtures_context_records: archaeological_context_records.identificationtype \ archaeological_context_records.unit \ archaeological_context_records.datingtype \ - archaeological_context_records.relationtype \ archaeological_context_records.excavationtechnictype \ archaeological_context_records.documentationtype \ > '../archaeological_context_records/fixtures/initial_data-'$(default_data)'.json' + cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ + archaeological_context_records.relationtype \ + > '../archaeological_context_records/fixtures/initial_data_relation_type-'$(default_data)'.json' + cat archaeological_context_records/fixtures/initial_data_relation_type-$(default_data).json | tr '\n' '\r' | \ + sed -e 's/"inverse_relation": *\[\r *\"[-_a-z0-9]*\" *\r *\]/"inverse_relation": null/g' | \ + tr '\r' '\n' > archaeological_context_records/fixtures/initial_data_relation_type_norel-'$(default_data)'.json fixtures_finds: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 0de30ef31..b26823777 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -41,6 +41,10 @@ from archaeological_context_records import views CONTEXT_RECORD_FIXTURES = FILE_FIXTURES + [ settings.ROOT_PATH + '../archaeological_context_records/fixtures/initial_data-fr.json', + '../archaeological_context_records/fixtures/' + 'initial_data_relation_type_norel-fr.json', + '../archaeological_context_records/fixtures/' + 'initial_data_relation_type-fr.json', ] CONTEXT_RECORD_TOWNS_FIXTURES = FILE_TOWNS_FIXTURES + [ diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index de5bda726..b05d7d16d 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -296,7 +296,7 @@ EOF ./manage.py migrate cecho y " - loading fixtures" - FIXTURES="$DEST/fixtures/initial_data-auth-fr.json $DEST/ishtar_common/fixtures/initial_data-fr.json $DEST/ishtar_common/fixtures/initial_importtypes-fr.json $DEST/archaeological_operations/fixtures/initial_data-fr.json $DEST/archaeological_context_records/fixtures/initial_data-fr.json $DEST/archaeological_files/fixtures/initial_data-fr.json $DEST/archaeological_finds/fixtures/initial_data-fr.json $DEST/archaeological_warehouse/fixtures/initial_data-fr.json" + FIXTURES="$DEST/fixtures/initial_data-auth-fr.json $DEST/ishtar_common/fixtures/initial_data-fr.json $DEST/ishtar_common/fixtures/initial_importtypes-fr.json $DEST/archaeological_operations/fixtures/initial_data-fr.json $DEST/archaeological_operations/fixtures/initial_data_relation_type_norel-fr.json $DEST/archaeological_operations/fixtures/initial_data_relation_type-fr.json $DEST/archaeological_context_records/fixtures/initial_data-fr.json $DEST/archaeological_context_records/fixtures/initial_data_relation_type_norel-fr.json $DEST/archaeological_context_records/fixtures/initial_data_relation_type-fr.json $DEST/archaeological_files/fixtures/initial_data-fr.json $DEST/archaeological_finds/fixtures/initial_data-fr.json $DEST/archaeological_warehouse/fixtures/initial_data-fr.json" for data in $FIXTURES; do echo $data; ./manage.py loaddata $data; diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index ad623980d..8f94b1b12 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -50,7 +50,10 @@ COMMON_FIXTURES = [ OPERATION_FIXTURES = COMMON_FIXTURES + [ settings.ROOT_PATH + - '../archaeological_operations/fixtures/initial_data-fr.json' + '../archaeological_operations/fixtures/initial_data-fr.json', + '../archaeological_operations/fixtures/' + 'initial_data_relation_type_norel-fr.json', + '../archaeological_operations/fixtures/initial_data_relation_type-fr.json', ] |