Change Menu call

1 files changed, 12 insertions, 6 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 352a3d6f1..5266f6cd7 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -56,7 +56,7 @@ from django.views.generic.edit import CreateView, DeleteView, FormView
 
 from xhtml2odt import xhtml2odt
 
-from menus import menu
+from menus import Menu
 
 from archaeological_files.models import File
 from archaeological_operations.models import Operation
@@ -465,15 +465,21 @@ def update_current_item(request, item_type=None, pk=None):
     return HttpResponse('ok')
 
 
+MAIN_MENU = None
+
+
 def check_permission(request, action_slug, obj_id=None):
-    if action_slug not in menu.items:
+    if not MAIN_MENU:
+        MAIN_MENU = Menu(None)
+        MAIN_MENU.init()
+    if action_slug not in MAIN_MENU.items:
         # TODO
         return True
     if obj_id:
-        return menu.items[action_slug].is_available(request.user, obj_id,
-                                                    session=request.session)
-    return menu.items[action_slug].can_be_available(request.user,
-                                                    session=request.session)
+        return MAIN_MENU.items[action_slug].is_available(
+            request.user, obj_id, session=request.session)
+    return MAIN_MENU.items[action_slug].can_be_available(
+        request.user, session=request.session)
 
 
 def autocomplete_person_permissive(request, person_types=None,