diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 4f010d866..6c682c932 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -49,11 +49,10 @@ if settings.XHTML2ODT_PATH: from xhtml2odt import xhtml2odt from menus import menu -import forms_main as ishtar_forms from ishtar_common.forms import FinalForm from ishtar_common.forms_common import PersonForm, PersonFormSelection,\ - AccountForm, FinalAccountForm + AccountForm, FinalAccountForm, OrganizationForm, AuthorForm from ishtar_common.wizards import PersonWizard, PersonModifWizard, AccountWizard import models @@ -494,13 +493,13 @@ def autocomplete_author(request): for author in authors]) return HttpResponse(data, mimetype='text/plain') -def new_item(model): +def new_item(model, frm): def func(request, parent_name): model_name = model._meta.object_name if not check_permission(request, 'add_'+model_name.lower()): not_permitted_msg = ugettext(u"Operation not permitted.") return HttpResponse(not_permitted_msg) - frm = getattr(ishtar_forms, model_name + 'Form') + #frm = getattr(ishtar_forms, model_name + 'Form') dct = {'title':unicode(_(u'New %s' % model_name.lower()))} if request.method == 'POST': dct['form'] = frm(request.POST) @@ -521,9 +520,9 @@ def new_item(model): context_instance=RequestContext(request)) return func -new_person = new_item(models.Person) -new_organization = new_item(models.Organization) -new_author = new_item(models.Author) +new_person = new_item(models.Person, PersonForm) +new_organization = new_item(models.Organization, OrganizationForm) +new_author = new_item(models.Author, AuthorForm) def action(request, action_slug, obj_id=None, *args, **kwargs): """ |