diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-23 18:25:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-23 18:25:58 +0200 |
| commit | 7be596f41305b4be26796625bd800d58a04bb0a7 (patch) | |
| tree | 9743bec37b2c651fafecfc373a1d5bb8bc2aadc3 /archaeological_operations | |
| parent | ed74b751839d42d30a74b0d67a47ae138a537377 (diff) | |
| download | Ishtar-7be596f41305b4be26796625bd800d58a04bb0a7.tar.bz2 Ishtar-7be596f41305b4be26796625bd800d58a04bb0a7.zip | |
PersonType from single value to multi value for Person
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/import_from_csv.py | 12 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py index ff3bd11f4..1176aec4c 100644 --- a/archaeological_operations/import_from_csv.py +++ b/archaeological_operations/import_from_csv.py @@ -305,11 +305,11 @@ def parse_name_surname(value): return q.all()[0] else: defaults = {'history_modifier':DEFAULT_PERSON, - 'title':'', - 'person_type':PersonType.objects.get( - txt_idx='head_scientist')} + 'title':''} defaults.update(values) p = Person.objects.create(**defaults) + p.person_types.add(PersonType.objects.get( + txt_idx='head_scientist')) return p def parse_person(surname, name, old_ref, owner): @@ -323,11 +323,11 @@ def parse_person(surname, name, old_ref, owner): return q.all()[0] else: defaults = {'history_modifier':owner, - 'title':'', - 'person_type':PersonType.objects.get( - txt_idx='head_scientist')} + 'title':''} defaults.update(values) p = Person.objects.create(**defaults) + p.person_types.add(PersonType.objects.get( + txt_idx='head_scientist')) return p def parse_comment_addr_nature(nature, addr, owner): diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index c2e0b135c..97446b635 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -31,13 +31,11 @@ from forms import * import models def autocomplete_patriarche(request, non_closed=True): - person_types = request.user.ishtaruser.person.person_type if (not request.user.has_perm('ishtar_common.view_operation', models.Operation) and not request.user.has_perm('ishtar_common.view_own_operation', models.Operation) - and not person_types.rights.filter( - wizard__url_name='operation_search').count()): + and not request.user.ishtaruser.has_right('operation_search')): return HttpResponse(mimetype='text/plain') if not request.GET.get('term'): return HttpResponse(mimetype='text/plain') @@ -60,8 +58,7 @@ def autocomplete_operation(request, non_closed=True): models.Operation) and not request.user.has_perm('ishtar_common.view_own_operation', models.Operation) - and not person_types.rights.filter( - wizard__url_name='operation_search').count()): + and not request.user.ishtaruser.has_right('operation_search')): return HttpResponse(mimetype='text/plain') if not request.GET.get('term'): return HttpResponse(mimetype='text/plain') |