First work on the wizard (refs #51)

1 files changed, 9 insertions, 6 deletions

diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py
index 29c6e11be..359fc1b58 100644
--- a/ishtar/furnitures/views.py
+++ b/ishtar/furnitures/views.py
@@ -28,6 +28,7 @@ from django.utils.translation import ugettext, ugettext_lazy as _
 
 from ishtar import settings
 from menus import menu
+from forms import FileForm1, FileForm2, FileWizard
 
 def index(request):
     """
@@ -36,21 +37,23 @@ def index(request):
     dct = {}
     return render_to_response('index.html', dct,
                               context_instance=RequestContext(request))
-def action(request, action, obj=None, step=None):
+def action(request, action, obj_id=None, *args, **kwargs):
     """
     Action management
     """
-    if obj and not menu.items[action].is_available(request.user, obj) or \
+    if obj_id and not menu.items[action].is_available(request.user, obj_id) or \
        not menu.items[action].can_be_available(request.user):
         not_permitted_msg = ugettext(u"Operation not permitted.")
         return HttpResponse(not_permitted_msg)
     dct = {'current_action':action}
     globals_dct = globals()
     if action in globals_dct:
-        return globals_dct[action](request, dct, obj, step)
+        return globals_dct[action](request, dct, obj_id, *args, **kwargs)
     return render_to_response('index.html', dct,
                               context_instance=RequestContext(request))
 
-def file_creation(request, dct, obj, step):
-    return render_to_response('index.html', dct,
-                              context_instance=RequestContext(request))
+file_wizard = FileWizard([FileForm1, FileForm2])
+
+def file_creation(request, dct, obj_id, *args, **kwargs):
+    return file_wizard(request, *args, **kwargs)
+