New management of popup for new items - manage author and persons

1 files changed, 8 insertions, 3 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index acf7eb70c..d1924accc 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -69,7 +69,7 @@ from ishtar_common.utils import clean_session_cache, CSV_OPTIONS, \
 from ishtar_common.widgets import JQueryAutoComplete
 
 from .views_item import CURRENT_ITEM_KEYS, CURRENT_ITEM_KEYS_DICT, \
-    check_permission, display_item, get_item, new_item, show_item
+    check_permission, display_item, get_item, new_item, show_item, new_qa_item
 
 logger = logging.getLogger(__name__)
 
@@ -734,13 +734,13 @@ def autocomplete_author(request):
     return HttpResponse(data, content_type='text/plain')
 
 
-new_person = new_item(models.Person, forms.PersonForm)
+new_person = new_qa_item(models.Person, forms.PersonForm)
 new_person_noorga = new_item(models.Person, forms.NoOrgaPersonForm)
 new_organization = new_item(models.Organization, forms.OrganizationForm)
 show_organization = show_item(models.Organization, 'organization')
 get_organization = get_item(models.Organization, 'get_organization',
                             'organization')
-new_author = new_item(models.Author, forms.AuthorForm)
+new_author = new_qa_item(models.Author, forms.AuthorForm)
 show_person = show_item(models.Person, 'person')
 
 get_person = get_item(models.Person, 'get_person', 'person')
@@ -1881,6 +1881,11 @@ class DocumentSelectView(IshtarMixin, LoginRequiredMixin,
 class DocumentEditView(DocumentFormMixin, UpdateView):
     page_name = _(u"Document modification")
 
+    def get_context_data(self, **kwargs):
+        data = super(DocumentEditView, self).get_context_data(**kwargs)
+        data["extra_form_modals"] = ['author', 'person']
+        return data
+
     def get_form_kwargs(self):
         kwargs = super(DocumentEditView, self).get_form_kwargs()
         try: