Adapt menus and urls for right management - check_rights_condition for filtering wizard steps

1 files changed, 78 insertions, 63 deletions

diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index b02136841..30cba6735 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -19,78 +19,93 @@
 
 from django.utils.translation import ugettext_lazy as _
 
-from archaeological_operations.models import Operation
 from ishtar_common.menu_base import SectionItem, MenuItem
 
 import models
 
+# be carreful: each access_controls must be relevant with check_rights in urls
+
 MENU_SECTIONS = [
     (5, SectionItem('admin', _(u"Administration"),
-            childs=[
-                MenuItem('account_management', _(u"Account management"),
-                    model=models.IshtarUser,
-                    access_controls=['add_ishtaruser',]),
-                MenuItem('admin-globalvar', _(u"Global variables"),
-                    model=models.GlobalVar,
-                    access_controls=['add_globalvar',]),
-            ])
+     childs=[
+        MenuItem('account_management', _(u"Account management"),
+                 model=models.IshtarUser,
+                 access_controls=['add_ishtaruser', ]),
+        MenuItem('admin-globalvar', _(u"Global variables"),
+                 model=models.GlobalVar,
+                 access_controls=['add_globalvar', ]),
+    ])
     ),
     (10, SectionItem('administration', _(u"Directory"),
+     childs=[
+        SectionItem(
+            'person', _(u"Person"),
             childs=[
-                SectionItem('person', _(u"Person"),
-                childs=[
-                    MenuItem('person_search', _(u"Search"),
-                        model=models.Person,
-                        access_controls=['add_person', 'add_own_person']),
-                    MenuItem('person_creation', _(u"Creation"),
-                        model=models.Person,
-                        access_controls=['add_person', 'add_own_person']),
-                    MenuItem('person_modification', _(u"Modification"),
-                        model=models.Person,
-                        access_controls=['change_person', 'change_own_person']),
-                    MenuItem('person_merge', _(u"Merge"),
-                        model=models.Person,
-                        access_controls=['merge_person',]),
-                    MenuItem('person_deletion', _(u"Delete"),
-                        model=models.Person,
-                        access_controls=['change_person', 'change_own_person']),
-                    ]),
-                SectionItem('organization', _(u"Organization"),
-                childs=[
-                    MenuItem('organization_search', _(u"Search"),
-                        model=models.Organization,
-                        access_controls=['add_organization',
-                                         'add_own_organization']),
-                    MenuItem('organization_creation', _(u"Creation"),
-                        model=models.Organization,
-                        access_controls=['add_organization',
-                                         'add_own_organization']),
-                    MenuItem('organization_modification', _(u"Modification"),
-                        model=models.Organization,
-                        access_controls=['change_organization',
-                                         'change_own_organization']),
-                    MenuItem('organization_merge', _(u"Merge"),
-                        model=models.Organization,
-                        access_controls=['merge_organization',]),
-                    MenuItem('organization_deletion', _(u"Delete"),
-                        model=models.Organization,
-                        access_controls=['change_organization',
-                                         'change_own_organization']),
-                    ]),
-            ])
-    ),
-    (15, SectionItem('imports', _(u"Imports"),
+                MenuItem(
+                    'person_search', _(u"Search"),
+                    model=models.Person,
+                    access_controls=['add_person']),
+                MenuItem(
+                    'person_creation', _(u"Creation"),
+                    model=models.Person,
+                    access_controls=['add_person']),
+                MenuItem(
+                    'person_modification', _(u"Modification"),
+                    model=models.Person,
+                    access_controls=['change_person', 'change_own_person']),
+                MenuItem(
+                    'person_merge', _(u"Merge"),
+                    model=models.Person,
+                    access_controls=['merge_person']),
+                MenuItem(
+                    'person_deletion', _(u"Delete"),
+                    model=models.Person,
+                    access_controls=['change_person', 'change_own_person']),
+            ]),
+        SectionItem(
+            'organization', _(u"Organization"),
             childs=[
-                MenuItem('import-new', _(u"New import"),
-                    model=models.Import,
-                    access_controls=['change_import']),
-                MenuItem('import-list', _(u"Current imports"),
-                    model=models.Import,
-                    access_controls=['change_import']),
-                MenuItem('import-list-old', _(u"Old imports"),
-                    model=models.Import,
-                    access_controls=['change_import']),
-            ])
+                MenuItem(
+                    'organization_search', _(u"Search"),
+                    model=models.Organization,
+                    access_controls=['add_organization',
+                                     'add_own_organization']),
+                MenuItem(
+                    'organization_creation', _(u"Creation"),
+                    model=models.Organization,
+                    access_controls=['add_organization',
+                                     'add_own_organization']),
+                MenuItem(
+                    'organization_modification', _(u"Modification"),
+                    model=models.Organization,
+                    access_controls=['change_organization',
+                                     'change_own_organization']),
+                MenuItem(
+                    'organization_merge', _(u"Merge"),
+                    model=models.Organization,
+                    access_controls=['merge_organization']),
+                MenuItem(
+                    'organization_deletion', _(u"Delete"),
+                    model=models.Organization,
+                    access_controls=['change_organization',
+                                     'change_own_organization']),
+            ]),
+    ])
     ),
+    (15, SectionItem(
+        'imports', _(u"Imports"),
+        childs=[
+            MenuItem(
+                'import-new', _(u"New import"),
+                model=models.Import,
+                access_controls=['change_import']),
+            MenuItem(
+                'import-list', _(u"Current imports"),
+                model=models.Import,
+                access_controls=['change_import']),
+            MenuItem(
+                'import-list-old', _(u"Old imports"),
+                model=models.Import,
+                access_controls=['change_import']),
+        ])),
 ]
-