Djangoization - Major refactoring (step 15)

* works on dashboards

1 files changed, 16 insertions, 7 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 6c682c932..d0a5af7b7 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -535,6 +535,7 @@ def action(request, action_slug, obj_id=None, *args, **kwargs):
     associated_wizard = action_slug + '_wizard'
     dct = {}
     globals_dct = globals()
+    print action_slug
     if action_slug in globals_dct:
         return globals_dct[action_slug](request, dct, obj_id, *args, **kwargs)
     elif hasattr(ishtar_forms, action_slug + "_wizard"):
@@ -547,12 +548,20 @@ def dashboard_main(request, dct, obj_id=None, *args, **kwargs):
     """
     Main dashboard
     """
-    dct = {'items':[
-        (_(u"Archaeological files"), models.Dashboard(models.File)),
-        (_(u"Operations"), models.Dashboard(models.Operation)),
-        (_(u"Context records"), models.Dashboard(models.ContextRecord)),
-        (_(u"Archaeological items"), models.Dashboard(models.Item)),
-        ],
+    items = []
+    if 'archaeological_files' in settings.INSTALLED_APPS:
+        from archaeological_files.models import File
+        items.append((_(u"Archaeological files"),
+                     models.Dashboard(File)))
+    from archaeological_operations.models import Operation
+    items.append((_(u"Operations"), models.Dashboard(Operation)))
+    if 'archaeological_context_records' in settings.INSTALLED_APPS:
+        from archaeological_context_records.models import ContextRecord
+        items.append((_(u"Context records"), models.Dashboard(ContextRecord)))
+    if 'archaeological_finds' in settings.INSTALLED_APPS:
+        from archaeological_finds.models import Find
+        items.append((_(u"Context records"), models.Dashboard(Find)))
+    dct = {'items':items,
            'ishtar_users':models.UserDashboard()}
-    return render_to_response('dashboard_main.html', dct,
+    return render_to_response('ishtar/dashboards/dashboard_main.html', dct,
                                context_instance=RequestContext(request))