summaryrefslogtreecommitdiff
path: root/archaeological_files_pdl/forms.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-08-28 12:11:41 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-08-28 12:11:41 +0200
commit99209de93445c7f760b8f6f594c4700134aefb04 (patch)
treea667bc72d80244a271c403ceb490ef2c45aa4db6 /archaeological_files_pdl/forms.py
parentb6178af0b0ffe1d8a93b8f117ab9802f097fcbb1 (diff)
downloadIshtar-99209de93445c7f760b8f6f594c4700134aefb04.tar.bz2
Ishtar-99209de93445c7f760b8f6f594c4700134aefb04.zip
Archaeological files: add departments to preventive forms - Wizards manage several many to many in one form
Diffstat (limited to 'archaeological_files_pdl/forms.py')
-rw-r--r--archaeological_files_pdl/forms.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index a0c5037e7..3b5ed4601 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -24,7 +24,7 @@ from django.core import validators
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
-from ishtar_common.models import Person, PersonType, Town, valid_id
+from ishtar_common.models import Person, PersonType, Town, Department, valid_id
from archaeological_files import models
from ishtar_common.forms import get_now, reverse_lazy
@@ -74,12 +74,14 @@ class FileFormPreventiveType(forms.Form):
class FileFormPlanning(forms.Form):
form_label = _(u"Planning")
- base_model = 'town'
- associated_models = {'town': Town}
+ base_models = ['town', 'department']
+ associated_models = {'town': Town, 'department': Department}
name = forms.CharField(label=_(u"Planning name"), required=False,
max_length=100)
town = widgets.MultipleAutocompleteField(
model=Town, label=_("Towns"), required=False)
+ department = widgets.MultipleAutocompleteField(
+ model=Department, label=_("Departments"), required=False)
locality = forms.CharField(label=_(u"Locality"), max_length=100,
required=False)
address = forms.CharField(
@@ -266,7 +268,6 @@ class FileFormPlanningService(forms.Form):
def is_valid(self, *args, **kwargs):
c = super(FileFormPlanningService, self).is_valid(*args, **kwargs)
- print(self.cleaned_data)
return c
@@ -283,7 +284,7 @@ class FileFormInstruction(forms.Form):
limit={
'person_types': [
PersonType.objects.get(txt_idx='sra_agent').pk]
- },
+ },
associated_model=Person, new=True),
validators=[valid_id(Person)])
related_file = forms.IntegerField(