New management of "popup" for new items -> change all form configuration

1 files changed, 6 insertions, 28 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index b0ec0bdce..ea76380fa 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -140,32 +140,6 @@ def check_permission(request, action_slug, obj_id=None):
         request.user, session=request.session)
 
 
-def new_item(model, frm, many=False):
-    def func(request, parent_name, limits=''):
-        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)
-        dct = {'title': str(_(u'New %s' % model_name.lower())),
-               'many': many}
-        if request.method == 'POST':
-            dct['form'] = frm(request.POST, limits=limits)
-            if dct['form'].is_valid():
-                new_item = dct['form'].save(request.user)
-                dct['new_item_label'] = str(new_item)
-                dct['new_item_pk'] = new_item.pk
-                dct['parent_name'] = parent_name
-                dct['parent_pk'] = parent_name
-                if dct['parent_pk'] and '_select_' in dct['parent_pk']:
-                    parents = dct['parent_pk'].split('_')
-                    dct['parent_pk'] = "_".join([parents[0]] + parents[2:])
-                return render(request, 'window.html', dct)
-        else:
-            dct['form'] = frm(limits=limits)
-        return render(request, 'window.html', dct)
-    return func
-
-
 def new_qa_item(model, frm, many=False):
     def func(request, parent_name, limits=''):
         template = "ishtar/forms/qa_new_item.html"
@@ -173,9 +147,13 @@ def new_qa_item(model, frm, many=False):
         if not check_permission(request, 'add_' + model_name.lower()):
             not_permitted_msg = ugettext(u"Operation not permitted.")
             return HttpResponse(not_permitted_msg)
+        slug = model.SLUG
+        if model.SLUG == "site":
+            slug = "archaeologicalsite"
+        url_slug = "new-" + slug
         dct = {'page_name': str(_(u'New %s' % model_name.lower())),
-               'url': reverse("new-" + model.SLUG, args=[parent_name]),
-               'slug': model.SLUG,
+               'url': reverse(url_slug, args=[parent_name]),
+               'slug': slug,
                'parent_name': parent_name,
                'many': many}
         if request.method == 'POST':