diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:32:45 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:32:45 +0200 |
commit | 51641d3cff52cee81f35e6ac690be01a2702a79b (patch) | |
tree | 203156d91cfd3a48b640f26d6887db8330218d2d | |
parent | 151e42654a4bcfcff408c7799db199c71e81b5c5 (diff) | |
download | Ishtar-51641d3cff52cee81f35e6ac690be01a2702a79b.tar.bz2 Ishtar-51641d3cff52cee81f35e6ac690be01a2702a79b.zip |
Adapt migrations from master
-rw-r--r-- | ishtar_common/migrations/0008_auto_ishtar_common_town_imports.py (renamed from ishtar_common/migrations/0055_auto.py) | 0 | ||||
-rw-r--r-- | ishtar_common/migrations/0009_auto__add_titletype__add_field_person_pretitle.py (renamed from ishtar_common/migrations/0056_auto__add_titletype__add_field_person_pretitle.py) | 0 | ||||
-rw-r--r-- | ishtar_common/migrations/0010_rename_pretitle_old_title.py (renamed from ishtar_common/migrations/0057_rename_pretitle_old_title.py) | 0 | ||||
-rw-r--r-- | ishtar_common/migrations/0011_generate_title.py (renamed from ishtar_common/migrations/0058_generate_title.py) | 17 | ||||
-rw-r--r-- | ishtar_common/migrations/0012_rename_exc_from_merge_to_archived.py (renamed from ishtar_common/migrations/0059_rename_exc_from_merge_to_archived.py) | 0 | ||||
-rw-r--r-- | ishtar_common/migrations/0013_auto__add_historicalperson.py (renamed from ishtar_common/migrations/0060_auto__add_historicalperson.py) | 0 |
6 files changed, 15 insertions, 2 deletions
diff --git a/ishtar_common/migrations/0055_auto.py b/ishtar_common/migrations/0008_auto_ishtar_common_town_imports.py index db41eb868..db41eb868 100644 --- a/ishtar_common/migrations/0055_auto.py +++ b/ishtar_common/migrations/0008_auto_ishtar_common_town_imports.py diff --git a/ishtar_common/migrations/0056_auto__add_titletype__add_field_person_pretitle.py b/ishtar_common/migrations/0009_auto__add_titletype__add_field_person_pretitle.py index 6db62c107..6db62c107 100644 --- a/ishtar_common/migrations/0056_auto__add_titletype__add_field_person_pretitle.py +++ b/ishtar_common/migrations/0009_auto__add_titletype__add_field_person_pretitle.py diff --git a/ishtar_common/migrations/0057_rename_pretitle_old_title.py b/ishtar_common/migrations/0010_rename_pretitle_old_title.py index 8a13b6c88..8a13b6c88 100644 --- a/ishtar_common/migrations/0057_rename_pretitle_old_title.py +++ b/ishtar_common/migrations/0010_rename_pretitle_old_title.py diff --git a/ishtar_common/migrations/0058_generate_title.py b/ishtar_common/migrations/0011_generate_title.py index ac0d1d602..3fcb82ee5 100644 --- a/ishtar_common/migrations/0058_generate_title.py +++ b/ishtar_common/migrations/0011_generate_title.py @@ -21,12 +21,25 @@ class Migration(SchemaMigration): translation.activate('fr') for key, lbl in TYPE: lbl = translation.ugettext(lbl) - keys[key] = orm['ishtar_common.TitleType'].objects.create( - label=lbl, txt_idx=key.lower()) + q = orm['ishtar_common.TitleType'].objects.filter( + txt_idx=key.lower()) + if not q.count(): + keys[key] = orm['ishtar_common.TitleType'].objects.create( + label=lbl, txt_idx=key.lower()) + else: + keys[key] = q.all()[0] translation.deactivate() + # translated are also keys + for k in keys.keys(): + item = keys[k] + keys[item.label] = item for person in orm['ishtar_common.Person'].objects.all(): if not person.old_title: continue + if person.old_title not in keys: + print(u"For person {} ({} {}) no translation of {}.".format( + person.pk, person.name, person.surname, person.old_title)) + continue person.title_id = keys[person.old_title].id person.save() diff --git a/ishtar_common/migrations/0059_rename_exc_from_merge_to_archived.py b/ishtar_common/migrations/0012_rename_exc_from_merge_to_archived.py index c329b76e2..c329b76e2 100644 --- a/ishtar_common/migrations/0059_rename_exc_from_merge_to_archived.py +++ b/ishtar_common/migrations/0012_rename_exc_from_merge_to_archived.py diff --git a/ishtar_common/migrations/0060_auto__add_historicalperson.py b/ishtar_common/migrations/0013_auto__add_historicalperson.py index a1db55c37..a1db55c37 100644 --- a/ishtar_common/migrations/0060_auto__add_historicalperson.py +++ b/ishtar_common/migrations/0013_auto__add_historicalperson.py |