summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar/furnitures/views.py')
-rw-r--r--ishtar/furnitures/views.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py
index 894a8f0cf..1af2e3991 100644
--- a/ishtar/furnitures/views.py
+++ b/ishtar/furnitures/views.py
@@ -407,10 +407,8 @@ def autocomplete_warehouse(request):
return HttpResponse(data, mimetype='text/plain')
def new_item(model):
- def func(request, parent_name='', parent_pk=''):
+ def func(request, parent_name):
model_name = model._meta.object_name
- if not parent_name:
- parent_name = model_name.lower()
if not check_permission(request, 'add_'+model_name.lower()):
not_permitted_msg = ugettext(u"Operation not permitted.")
return HttpResponse(not_permitted_msg)
@@ -419,11 +417,15 @@ def new_item(model):
if request.method == 'POST':
dct['form'] = frm(request.POST)
if dct['form'].is_valid():
- new_item = dct['form'].save()
+ new_item = dct['form'].save(request.user)
dct['new_item_label'] = unicode(new_item)
dct['new_item_pk'] = new_item.pk
dct['parent_name'] = parent_name
- dct['parent_pk'] = parent_pk
+ dct['parent_pk'] = parent_name
+ if '_select_' in dct['parent_pk']:
+ parents = dct['parent_pk'].split('_')
+ dct['parent_pk'] = "_".join([parents[0]] + parents[2:])
+ print dct
return render_to_response('window.html', dct,
context_instance=RequestContext(request))
else: