summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-05 13:27:29 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-05 13:27:29 +0100
commit1750ec8e009e1413867ffc1c3c6a1f96f0b425fa (patch)
tree3159428d0c2889320cb341b3ad3f4af4d90603af
parent49cde9a6af567e84fafee23ef7cb8b23dca14d0f (diff)
downloadIshtar-1750ec8e009e1413867ffc1c3c6a1f96f0b425fa.tar.bz2
Ishtar-1750ec8e009e1413867ffc1c3c6a1f96f0b425fa.zip
Fix Person modification
-rw-r--r--ishtar_common/forms_common.py4
-rw-r--r--ishtar_common/views.py6
2 files changed, 6 insertions, 4 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 584759c29..b6cab8b6a 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -124,7 +124,7 @@ class PersonFormSelection(forms.Form):
PersonSelect, models.Person),
validators=[models.valid_id(models.Person)])
-class PersonForm(forms.Form):
+class SimplePersonForm(forms.Form):
form_label = _("Identity")
associated_models = {'attached_to':models.Organization}
title = forms.ChoiceField(label=_("Title"), choices=models.Person.TYPE)
@@ -148,6 +148,8 @@ class PersonForm(forms.Form):
reverse_lazy('autocomplete-organization'),
associated_model=models.Organization, new=True),
validators=[models.valid_id(models.Organization)], required=False)
+
+class PersonForm(SimplePersonForm):
person_types = forms.MultipleChoiceField(label=_("Person type"),
choices=[], widget=forms.CheckboxSelectMultiple)
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 31f5f688b..c992b1a76 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -52,7 +52,7 @@ from menus import menu
from ishtar_common.forms import FinalForm
from ishtar_common.forms_common import PersonForm, PersonTypeForm, \
PersonFormSelection, AccountForm, FinalAccountForm, OrganizationForm, \
- AuthorForm
+ AuthorForm, SimplePersonForm
from ishtar_common.wizards import PersonWizard, PersonModifWizard, AccountWizard
import models
@@ -74,7 +74,7 @@ def index(request):
context_instance=RequestContext(request))
person_creation_wizard = PersonWizard.as_view([
- ('identity-person_creation', PersonForm),
+ ('identity-person_creation', SimplePersonForm),
('person_type-person_creation', PersonTypeForm),
('final-person_creation', FinalForm)],
label=_(u"New person"),
@@ -82,7 +82,7 @@ person_creation_wizard = PersonWizard.as_view([
person_modification_wizard = PersonModifWizard.as_view([
('selec-person_modification', PersonFormSelection),
- ('identity-person_modification', PersonForm),
+ ('identity-person_modification', SimplePersonForm),
('person_type-person_creation', PersonTypeForm),
('final-person_modification', FinalForm)],
label=_(u"Person modification"),