Djangoization - Major refactoring (step 3)

Reorganization of views, urls, menus, admin, forms.
Changes on models.

1 files changed, 14 insertions, 5 deletions

diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index 5de5a6afd..884ec19b4 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -23,6 +23,19 @@ from django.utils.translation import ugettext, ugettext_lazy as _
 
 from menus import Menu
 import models
+from archaeological_operations.models import Operation
+
+CURRENT_ITEMS = []
+if 'archaeological_files' in settings.INSTALLED_APPS:
+    from archaeological_files.models import File
+    CURRENT_ITEMS.append((_(u"Archaeological file"), File))
+CURRENT_ITEMS.append((_(u"Operation"), Operation))
+if 'archaeological_context_records' in settings.INSTALLED_APPS:
+    from archaeological_context_records.models import ContextRecord
+    CURRENT_ITEMS.append((_(u"Context record"), ContextRecord))
+if 'archaeological_finds' in settings.INSTALLED_APPS:
+    from archaeological_finds.models import Find
+    CURRENT_ITEMS.append((_(u"Find"), Find))
 
 def get_base_context(request):
     dct = {'URL_PATH':settings.URL_PATH}
@@ -39,11 +52,7 @@ def get_base_context(request):
     dct['JQUERY_URL'] = settings.JQUERY_URL
     dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL
     dct['current_menu'] = []
-    for lbl, model in ((_(u"Archaeological file"), models.File),
-                       (_(u"Operation"), models.Operation),
-                       (_(u"Context record"), models.ContextRecord),
-                       (_(u"Archaeological item"), models.Item),
-                       ):
+    for lbl, model in CURRENT_ITEMS:
         model_name = model.__name__.lower()
         current = model_name in request.session and request.session[model_name]
         items = []