diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-24 18:23:28 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-24 18:23:28 +0200 | 
| commit | 4404bafa193a37517f43932de4dafcb763b9f709 (patch) | |
| tree | 2667d79b42cc993d0668317e3100a237fa33ce4d /archaeological_finds/forms.py | |
| parent | 01dacc332490e462fd7a1fa817b293a7398d2307 (diff) | |
| parent | ae8a81de6b6786518027ccd8f09e825d107be5e7 (diff) | |
| download | Ishtar-4404bafa193a37517f43932de4dafcb763b9f709.tar.bz2 Ishtar-4404bafa193a37517f43932de4dafcb763b9f709.zip  | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index a617c8ee1..1ca359cce 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -29,7 +29,8 @@ from django.forms.formsets import formset_factory  from django.utils.safestring import mark_safe  from django.utils.translation import ugettext_lazy as _ -from ishtar_common.models import Person, valid_id, valid_ids, get_current_profile +from ishtar_common.models import Person, valid_id, valid_ids, \ +    get_current_profile  from archaeological_operations.models import Period, ArchaeologicalSite, \      RelationType as OpeRelationType  from archaeological_context_records.models import DatingType, DatingQuality, \ @@ -562,7 +563,7 @@ class BaseTreatmentForm(SelectFindBasketForm):                           'basket': models.FindBasket}      treatment_type = forms.ChoiceField(label=_(u"Treatment type"), choices=[])      person = forms.IntegerField( -        label=_(u"Person"), +        label=_(u"Doer"),          widget=widgets.JQueryAutoComplete(              reverse_lazy('autocomplete-person'), associated_model=Person,              new=True),  | 
