diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 5e49ddc13..c03870935 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -51,10 +51,8 @@ if settings.XHTML2ODT_PATH: from menus import menu from ishtar_common.forms import FinalForm -from ishtar_common.forms_common import PersonForm, PersonTypeForm, \ - PersonFormSelection, AccountForm, FinalAccountForm, OrganizationForm, \ - AuthorForm, SimplePersonForm -from ishtar_common.wizards import PersonWizard, PersonModifWizard, AccountWizard +from ishtar_common import forms_common as forms +from ishtar_common import wizards import models CSV_OPTIONS = {'delimiter':';', 'quotechar':'"', 'quoting':csv.QUOTE_ALL} @@ -74,25 +72,38 @@ def index(request): return render_to_response('index.html', dct, context_instance=RequestContext(request)) -person_creation_wizard = PersonWizard.as_view([ - ('identity-person_creation', SimplePersonForm), - ('person_type-person_creation', PersonTypeForm), +person_creation_wizard = wizards.PersonWizard.as_view([ + ('identity-person_creation', forms.SimplePersonForm), + ('person_type-person_creation', forms.PersonTypeForm), ('final-person_creation', FinalForm)], label=_(u"New person"), url_name='person_creation') -person_modification_wizard = PersonModifWizard.as_view([ - ('selec-person_modification', PersonFormSelection), - ('identity-person_modification', SimplePersonForm), - ('person_type-person_creation', PersonTypeForm), +person_modification_wizard = wizards.PersonModifWizard.as_view([ + ('selec-person_modification', forms.PersonFormSelection), + ('identity-person_modification', forms.SimplePersonForm), + ('person_type-person_creation', forms.PersonTypeForm), ('final-person_modification', FinalForm)], label=_(u"Person modification"), url_name='person_modification') -account_management_wizard = AccountWizard.as_view([ - ('selec-account_management', PersonFormSelection), - ('account-account_management', AccountForm), - ('final-account_management', FinalAccountForm)], +organization_creation_wizard = wizards.OrganizationWizard.as_view([ + ('identity-organization_creation', forms.OrganizationForm), + ('final-organization_creation', FinalForm)], + label=_(u"New organization"), + url_name='organization_creation') + +organization_modification_wizard = wizards.OrganizationModifWizard.as_view([ + ('selec-organization_modification', forms.OrganizationFormSelection), + ('identity-organization_modification', forms.OrganizationForm), + ('final-organization_modification', FinalForm)], + label=_(u"Organization modification"), + url_name='organization_modification') + +account_management_wizard = wizards.AccountWizard.as_view([ + ('selec-account_management', forms.PersonFormSelection), + ('account-account_management', forms.AccountForm), + ('final-account_management', forms.FinalAccountForm)], label=_(u"Account management"), url_name='account_management',) @@ -584,9 +595,16 @@ def new_item(model, frm): context_instance=RequestContext(request)) return func -new_person = new_item(models.Person, PersonForm) -new_organization = new_item(models.Organization, OrganizationForm) -new_author = new_item(models.Author, AuthorForm) +new_person = new_item(models.Person, forms.PersonForm) +new_organization = new_item(models.Organization, forms.OrganizationForm) +show_organization = show_item(models.Organization, 'organization') +get_organization = get_item(models.Organization, + 'get_organization', 'organization', + extra_request_keys={ + 'name':'name__icontains', + 'organization_type':'organization_type__pk__in', + },) +new_author = new_item(models.Author, forms.AuthorForm) show_person = show_item(models.Person, 'person') get_person = get_item(models.Person, 'get_person', 'person', |