Format - black: ishtar_common

1 files changed, 192 insertions, 108 deletions

diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index 1e64a80f2..0574d0852 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
@@ -26,125 +26,209 @@ from . import models
 # be careful: each access_controls must be relevant with check_rights in urls
 
 MENU_SECTIONS = [
-    (1, SectionItem('home', _("Home"), childs=[])),
-    (5, SectionItem('admin', _("Administration"),
-     childs=[
+    (1, SectionItem("home", _("Home"), childs=[])),
+    (
+        5,
         SectionItem(
-            'account', _("Account"),
-            childs=[MenuItem('account_management', _("Addition/modification"),
-                             model=models.IshtarUser,
-                             access_controls=['administrator', ]),
-                    MenuItem('account_deletion', _("Deletion"),
-                             model=models.IshtarUser,
-                             access_controls=['administrator', ]), ]),
-        MenuItem('admin-globalvar', _("Global variables"),
-                 model=models.GlobalVar,
-                 access_controls=['administrator', ]),
-    ])
+            "admin",
+            _("Administration"),
+            childs=[
+                SectionItem(
+                    "account",
+                    _("Account"),
+                    childs=[
+                        MenuItem(
+                            "account_management",
+                            _("Addition/modification"),
+                            model=models.IshtarUser,
+                            access_controls=[
+                                "administrator",
+                            ],
+                        ),
+                        MenuItem(
+                            "account_deletion",
+                            _("Deletion"),
+                            model=models.IshtarUser,
+                            access_controls=[
+                                "administrator",
+                            ],
+                        ),
+                    ],
+                ),
+                MenuItem(
+                    "admin-globalvar",
+                    _("Global variables"),
+                    model=models.GlobalVar,
+                    access_controls=[
+                        "administrator",
+                    ],
+                ),
+            ],
+        ),
     ),
-    (10, SectionItem('administration', _("Directory"),
-     childs=[
+    (
+        10,
         SectionItem(
-            'person', _("Person"),
+            "administration",
+            _("Directory"),
+            childs=[
+                SectionItem(
+                    "person",
+                    _("Person"),
+                    childs=[
+                        MenuItem(
+                            "person_search",
+                            _("Search"),
+                            model=models.Person,
+                            access_controls=["add_person"],
+                        ),
+                        MenuItem(
+                            "person_creation",
+                            _("Creation"),
+                            model=models.Person,
+                            access_controls=["add_person"],
+                        ),
+                        MenuItem(
+                            "person_modification",
+                            _("Modification"),
+                            model=models.Person,
+                            access_controls=["change_person", "change_own_person"],
+                        ),
+                        MenuItem(
+                            "person-merge",
+                            _("Automatic merge"),
+                            model=models.Person,
+                            access_controls=["administrator"],
+                        ),
+                        MenuItem(
+                            "person-manual-merge",
+                            _("Manual merge"),
+                            model=models.Person,
+                            access_controls=["administrator"],
+                        ),
+                        MenuItem(
+                            "person_deletion",
+                            _("Deletion"),
+                            model=models.Person,
+                            access_controls=["change_person", "change_own_person"],
+                        ),
+                    ],
+                ),
+                SectionItem(
+                    "organization",
+                    _("Organization"),
+                    childs=[
+                        MenuItem(
+                            "organization_search",
+                            _("Search"),
+                            model=models.Organization,
+                            access_controls=[
+                                "add_organization",
+                                "add_own_organization",
+                            ],
+                        ),
+                        MenuItem(
+                            "organization_creation",
+                            _("Creation"),
+                            model=models.Organization,
+                            access_controls=[
+                                "add_organization",
+                                "add_own_organization",
+                            ],
+                        ),
+                        MenuItem(
+                            "organization_modification",
+                            _("Modification"),
+                            model=models.Organization,
+                            access_controls=[
+                                "change_organization",
+                                "change_own_organization",
+                            ],
+                        ),
+                        MenuItem(
+                            "organization-merge",
+                            _("Automatic merge"),
+                            model=models.Organization,
+                            access_controls=["administrator"],
+                        ),
+                        MenuItem(
+                            "orga-manual-merge",
+                            _("Manual merge"),
+                            model=models.Organization,
+                            access_controls=["administrator"],
+                        ),
+                        MenuItem(
+                            "organization_deletion",
+                            _("Deletion"),
+                            model=models.Organization,
+                            access_controls=[
+                                "change_organization",
+                                "change_own_organization",
+                            ],
+                        ),
+                    ],
+                ),
+            ],
+        ),
+    ),
+    (
+        15,
+        SectionItem(
+            "imports",
+            _("Imports"),
             childs=[
                 MenuItem(
-                    'person_search', _("Search"),
-                    model=models.Person,
-                    access_controls=['add_person']),
-                MenuItem(
-                    'person_creation', _("Creation"),
-                    model=models.Person,
-                    access_controls=['add_person']),
-                MenuItem(
-                    'person_modification', _("Modification"),
-                    model=models.Person,
-                    access_controls=['change_person', 'change_own_person']),
-                MenuItem(
-                    'person-merge', _("Automatic merge"),
-                    model=models.Person,
-                    access_controls=['administrator']),
+                    "import-new",
+                    _("New import"),
+                    model=models.Import,
+                    access_controls=["change_import"],
+                ),
                 MenuItem(
-                    'person-manual-merge', _("Manual merge"),
-                    model=models.Person,
-                    access_controls=['administrator']),
+                    "import-list",
+                    _("Current imports"),
+                    model=models.Import,
+                    access_controls=["change_import"],
+                ),
                 MenuItem(
-                    'person_deletion', _("Deletion"),
-                    model=models.Person,
-                    access_controls=['change_person', 'change_own_person']),
-            ]),
+                    "import-list-old",
+                    _("Old imports"),
+                    model=models.Import,
+                    access_controls=["change_import"],
+                ),
+            ],
+        ),
+    ),
+    (
+        250,
         SectionItem(
-            'organization', _("Organization"),
+            "document",
+            _("Documentation / Images"),
             childs=[
                 MenuItem(
-                    'organization_search', _("Search"),
-                    model=models.Organization,
-                    access_controls=['add_organization',
-                                     'add_own_organization']),
-                MenuItem(
-                    'organization_creation', _("Creation"),
-                    model=models.Organization,
-                    access_controls=['add_organization',
-                                     'add_own_organization']),
-                MenuItem(
-                    'organization_modification', _("Modification"),
-                    model=models.Organization,
-                    access_controls=['change_organization',
-                                     'change_own_organization']),
+                    "document/search",
+                    _("Search"),
+                    model=models.Document,
+                    access_controls=["view_document", "view_own_document"],
+                ),
                 MenuItem(
-                    'organization-merge', _("Automatic merge"),
-                    model=models.Organization,
-                    access_controls=['administrator']),
+                    "document/create",
+                    _("Creation"),
+                    model=models.Document,
+                    access_controls=["add_document", "add_own_document"],
+                ),
                 MenuItem(
-                    'orga-manual-merge', _("Manual merge"),
-                    model=models.Organization,
-                    access_controls=['administrator']),
+                    "document/edit",
+                    _("Modification"),
+                    model=models.Document,
+                    access_controls=["change_document", "change_own_document"],
+                ),
                 MenuItem(
-                    'organization_deletion', _("Deletion"),
-                    model=models.Organization,
-                    access_controls=['change_organization',
-                                     'change_own_organization']),
-            ]),
-    ])
+                    "document/delete",
+                    _("Deletion"),
+                    model=models.Document,
+                    access_controls=["change_document", "change_own_document"],
+                ),
+            ],
+        ),
     ),
-    (15, SectionItem(
-        'imports', _("Imports"),
-        childs=[
-            MenuItem(
-                'import-new', _("New import"),
-                model=models.Import,
-                access_controls=['change_import']),
-            MenuItem(
-                'import-list', _("Current imports"),
-                model=models.Import,
-                access_controls=['change_import']),
-            MenuItem(
-                'import-list-old', _("Old imports"),
-                model=models.Import,
-                access_controls=['change_import']),
-        ])),
-    (250, SectionItem(
-        'document', _("Documentation / Images"),
-        childs=[
-            MenuItem('document/search',
-                     _("Search"),
-                     model=models.Document,
-                     access_controls=['view_document',
-                                      'view_own_document']),
-            MenuItem('document/create',
-                     _("Creation"),
-                     model=models.Document,
-                     access_controls=['add_document',
-                                      'add_own_document']),
-            MenuItem('document/edit',
-                     _("Modification"),
-                     model=models.Document,
-                     access_controls=['change_document',
-                                      'change_own_document']),
-            MenuItem('document/delete',
-                     _("Deletion"),
-                     model=models.Document,
-                     access_controls=['change_document',
-                                      'change_own_document']),
-        ])
-     )
 ]