Merge branch 'master' into v0.9

1 files changed, 45 insertions, 54 deletions

diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index 60f764ab7..a0852147a 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -17,7 +17,6 @@
 
 # See the file COPYING for details.
 
-from django.conf import settings
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.menu_base import SectionItem, MenuItem
@@ -26,8 +25,6 @@ import models
 
 # be carreful: each access_controls must be relevant with check_rights in urls
 
-FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
-
 MENU_SECTIONS = [
     (30, SectionItem(
         'operation_management', _(u"Operation"),
@@ -57,6 +54,38 @@ MENU_SECTIONS = [
                 access_controls=['change_operation',
                                  'change_own_operation']),
             SectionItem(
+                'admin_act_operations',
+                _(u"Administrative act"),
+                profile_restriction='files',
+                childs=[
+                    MenuItem(
+                        'operation_administrativeactop_search',
+                        _(u"Search"),
+                        model=models.AdministrativeAct,
+                        access_controls=[
+                            'change_administrativeact']),
+                    MenuItem(
+                        'operation_administrativeactop',
+                        _(u"Add"),
+                        model=models.AdministrativeAct,
+                        access_controls=['change_administrativeact']),
+                    MenuItem(
+                        'operation_administrativeactop_modification',
+                        _(u"Modification"),
+                        model=models.AdministrativeAct,
+                        access_controls=['change_administrativeact']),
+                    MenuItem(
+                        'operation_administrativeactop_deletion',
+                        _(u"Deletion"),
+                        model=models.AdministrativeAct,
+                        access_controls=['change_administrativeact']),
+                    MenuItem(
+                        'operation_administrativeact_document',
+                        _(u"Documents"),
+                        model=models.AdministrativeAct,
+                        access_controls=['change_administrativeact']),
+                ],),
+            SectionItem(
                 'operation_source', _(u"Documentation"),
                 childs=[
                     MenuItem('operation_source_search',
@@ -83,6 +112,19 @@ MENU_SECTIONS = [
         ]),
      ),
     (
+        35, SectionItem(
+            'administrativact_management', _(u"Administrative Act"),
+            profile_restriction='files',
+            childs=[
+                MenuItem(
+                    'administrativact_register',
+                    pgettext_lazy('admin act register', u"Register"),
+                    model=models.AdministrativeAct,
+                    access_controls=['view_administrativeact',
+                                     'view_own_administrativeact']),
+            ])
+    ),
+    (
         102, SectionItem(
             'dashboard', _(u"Dashboard"),
             childs=[
@@ -97,54 +139,3 @@ MENU_SECTIONS = [
             ]),
     ),
 ]
-
-if FILES_AVAILABLE:
-    MENU_SECTIONS.insert(
-        1,
-        (
-            35, SectionItem(
-                'administrativact_management', _(u"Administrative Act"),
-                childs=[
-                    MenuItem(
-                        'administrativact_register',
-                        pgettext_lazy('admin act register', u"Register"),
-                        model=models.AdministrativeAct,
-                        access_controls=['view_administrativeact',
-                                         'view_own_administrativeact']),
-                ])
-        )
-    )
-    MENU_SECTIONS[0][1].childs.insert(
-        5,
-        SectionItem(
-            'admin_act_operations',
-            _(u"Administrative act"),
-            childs=[
-                MenuItem(
-                    'operation_administrativeactop_search',
-                    _(u"Search"),
-                    model=models.AdministrativeAct,
-                    access_controls=[
-                        'change_administrativeact']),
-                MenuItem(
-                    'operation_administrativeactop',
-                    _(u"Add"),
-                    model=models.AdministrativeAct,
-                    access_controls=['change_administrativeact']),
-                MenuItem(
-                    'operation_administrativeactop_modification',
-                    _(u"Modification"),
-                    model=models.AdministrativeAct,
-                    access_controls=['change_administrativeact']),
-                MenuItem(
-                    'operation_administrativeactop_deletion',
-                    _(u"Deletion"),
-                    model=models.AdministrativeAct,
-                    access_controls=['change_administrativeact']),
-                MenuItem(
-                    'operation_administrativeact_document',
-                    _(u"Documents"),
-                    model=models.AdministrativeAct,
-                    access_controls=['change_administrativeact']),
-            ],)
-    )