Djangoization - Major refactoring (step 3)

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

1 files changed, 57 insertions, 41 deletions

diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index dfd45a167..faf749480 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -20,53 +20,69 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.menu_base import SectionItem, MenuItem
-from ishtar_common.models import AdministrativeAct
 
 import models
 
-ORDER = 30
-
 MENU_SECTIONS = [
-        SectionItem('operation_management', _(u"Operation"),
+    (30, SectionItem('operation_management', _(u"Operation"),
+        childs=[
+            MenuItem('operation_search', _(u"Search"),
+                model=models.Operation,
+                access_controls=['view_operation',
+                                 'view_own_operation']),
+            MenuItem('operation_creation', _(u"Creation"),
+                model=models.Operation,
+                access_controls=['add_operation',
+                                 'add_own_operation']),
+            MenuItem('operation_modification', _(u"Modification"),
+              model=models.Operation,
+              access_controls=['change_operation',
+                               'change_own_operation']),
+            MenuItem('operation_closing', _(u"Closing"),
+              model=models.Operation,
+              access_controls=['change_operation',
+                               'change_own_operation']),
+            MenuItem('operation_deletion', _(u"Deletion"),
+              model=models.Operation,
+              access_controls=['change_operation',
+                               'change_own_operation']),
+            SectionItem('admin_act_operations',
+                        _(u"Administrative act"),
             childs=[
-                    MenuItem('operation_search', _(u"Search"),
-                        model=models.Operation,
-                        access_controls=['view_operation',
-                                         'view_own_operation']),
-                    MenuItem('operation_creation', _(u"Creation"),
-                        model=models.Operation,
-                        access_controls=['add_operation',
-                                         'add_own_operation']),
-                    MenuItem('operation_modification', _(u"Modification"),
-                      model=models.Operation,
-                      access_controls=['change_operation',
-                                       'change_own_operation']),
-                    MenuItem('operation_closing', _(u"Closing"),
-                      model=models.Operation,
-                      access_controls=['change_operation',
-                                       'change_own_operation']),
-                    MenuItem('operation_deletion', _(u"Deletion"),
-                      model=models.Operation,
-                      access_controls=['change_operation',
-                                       'change_own_operation']),
-                    SectionItem('admin_act_operations',
-                                _(u"Administrative act"),
+                MenuItem('operation_administrativeactop',
+                         _(u"Add"),
+                  model=models.Operation,
+                  access_controls=['change_operation',
+                                   'change_own_operation']),
+                MenuItem('operation_administrativeactop_modification',
+                         _(u"Modification"),
+                  model=models.AdministrativeAct,
+                  access_controls=['change_operation',
+                                   'change_own_operation']),
+                MenuItem('operation_administrativeactop_deletion',
+                         _(u"Deletion"),
+                  model=models.AdministrativeAct,
+                  access_controls=['operation_deletion',
+                                   'delete_own_operation']),
+                ],),
+            SectionItem('operation_source', _(u"Documentation"),
                 childs=[
-                    MenuItem('operation_administrativeactop',
+                    MenuItem('operation_source_creation',
                              _(u"Add"),
-                      model=models.Operation,
-                      access_controls=['change_operation',
-                                       'change_own_operation']),
-                    MenuItem('operation_administrativeactop_modification',
+                             model=models.OperationSource,
+                             access_controls=['change_operation',
+                                              'change_own_operation']),
+                    MenuItem('operation_source_modification',
                              _(u"Modification"),
-                      model=AdministrativeAct,
-                      access_controls=['change_operation',
-                                       'change_own_operation']),
-                    MenuItem('operation_administrativeactop_deletion',
+                             model=models.OperationSource,
+                             access_controls=['change_operation',
+                                              'change_own_operation']),
+                    MenuItem('operation_source_deletion',
                              _(u"Deletion"),
-                      model=AdministrativeAct,
-                      access_controls=['operation_deletion',
-                                       'delete_own_operation']),
-                    ],),
-            ]),
+                             model=models.OperationSource,
+                             access_controls=['change_operation',
+                                              'change_own_operation']),
+                ])
+        ]),
+    )
 ]