Merge branch 'master' into v0.9

1 files changed, 8 insertions, 6 deletions

diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index ce303c344..03ba9bc36 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -25,18 +25,20 @@ from ishtar_common.utils import shortify
 
 from menus import Menu
 
+from ishtar_common.models import get_current_profile
 from archaeological_operations.models import Operation
+from archaeological_files.models import File
+from archaeological_context_records.models import ContextRecord
+from archaeological_finds.models import Find
 
+profile = get_current_profile()
 CURRENT_ITEMS = []
-if 'archaeological_files' in settings.INSTALLED_APPS:
-    from archaeological_files.models import File
+if profile.files:
     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
+if profile.context_record:
     CURRENT_ITEMS.append((_(u"Context record"), ContextRecord))
-if 'archaeological_finds' in settings.INSTALLED_APPS:
-    from archaeological_finds.models import Find
+if profile.find:
     CURRENT_ITEMS.append((_(u"Find"), Find))