Djangoization - Major refactoring (step 15)

* works on dashboards

1 files changed, 6 insertions, 24 deletions

diff --git a/ishtar_common/menus.py b/ishtar_common/menus.py
index 4802a369d..77dcabcd3 100644
--- a/ishtar_common/menus.py
+++ b/ishtar_common/menus.py
@@ -37,7 +37,7 @@ for app in settings.INSTALLED_APPS:
 
 # sort
 __section_items = [menu for order, menu in sorted(_extra_menus,
-                                                 key=lambda x:x[0])]
+                                                  key=lambda x:x[0])]
 # regroup menus
 _section_items, __keys = [], []
 for section_item in __section_items:
@@ -45,29 +45,11 @@ for section_item in __section_items:
         __keys.append(section_item.idx)
         _section_items.append(section_item)
         continue
-    _section_items[__keys.index(section_item.idx)].childs += section_item.childs
-"""
-        SectionItem('dashboard', _(u"Dashboard"),
-            childs=[
-                    MenuItem('dashboard_main', _(u"General informations"),
-                        model=models.File,
-                        access_controls=['change_file', 'change_own_file']),
-                    MenuItem('dashboard_file', _(u"Archaeological files"),
-                        model=models.File,
-                        access_controls=['change_file', 'change_own_file']),
-                    MenuItem('dashboard_operation', _(u"Operations"),
-                        model=models.Operation,
-                        access_controls=['change_operation',
-                                         'change_own_operation']),
-                    #MenuItem('dashboard_treatment', _(u"Treatments"),
-                    #   model=models.Treatment,
-                    #    access_controls=['change_treatment',]),
-                    #MenuItem('dashboard_warehouse', _(u"Warehouses"),
-                    #    model=models.Warehouse,
-                    #    access_controls=['change_warehouse',]),
-            ]),
-        ]
-"""
+    section_childs = _section_items[__keys.index(section_item.idx)].childs
+    childs_idx = [child.idx for child in section_childs]
+    for child in section_item.childs:
+        if child.idx not in childs_idx:
+            section_childs.append(child)
 
 class Menu:
     childs = _section_items