remove "Administration" entry - put Account management in "Directory" entry - admin: improve global var

5 files changed, 44 insertions, 49 deletions

diff --git a/CHANGES.md b/CHANGES.md
index a73197c84..32630daca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 ---
 title: Ishtar changelog
-date: 2023-01-30
+date: 2023-02-22
 ---
 
 Ishtar changelog
@@ -12,6 +12,8 @@ Ishtar changelog
 - sheet document: better UI for files
 - add "created" field on main items in order to facilitate queries
 - model: add history for document and containers
+- remove "Administration" entry - put Account management in "Directory" entry
+- Admin - Global variable: edit in table, add import/export in CSV/JSON
 
 ### Bug fixes ###
 - find form: remove TAQ/TPQ check
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 714b4c445..6429210d0 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -686,13 +686,6 @@ class AuthorAdmin(admin.ModelAdmin):
 admin_site.register(models.Author, AuthorAdmin)
 
 
-class GlobalVarAdmin(admin.ModelAdmin):
-    list_display = ["slug", "description", "value"]
-
-
-admin_site.register(models.GlobalVar, GlobalVarAdmin)
-
-
 class ChangeListForChangeView(ChangeList):
     def get_filters_params(self, params=None):
         """
@@ -1298,6 +1291,20 @@ class TitleType(GeneralTypeAdmin):
     ]
 
 
+class GlobalVarAdmin(ImportActionAdmin, ImportJSONActionAdmin):
+    list_display = ["slug", "value", "description"]
+    list_editable = ["value", "description"]
+    save_on_top = True
+    actions = [
+        export_as_csv_action(),
+        serialize_type_action,
+    ]
+    CSV_FIELD_ORDER = ["slug", "value", "description"]
+
+
+admin_site.register(models.GlobalVar, GlobalVarAdmin)
+
+
 class CreateAreaForm(forms.Form):
     department_number = forms.IntegerField(label=_("Department number"))
     area_name = forms.CharField(label=_("Area name"), required=False)
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index 698cc6658..a257fc31c 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -28,45 +28,6 @@ from . import models
 MENU_SECTIONS = [
     (1, SectionItem("home", _("Home"), childs=[])),
     (
-        5,
-        SectionItem(
-            "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",
@@ -115,6 +76,28 @@ MENU_SECTIONS = [
                     ],
                 ),
                 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",
+                            ],
+                        ),
+                    ],
+                ),
+                SectionItem(
                     "organization",
                     _("Organization"),
                     childs=[
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 974ad061f..c5b3816a4 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -422,7 +422,8 @@ urlpatterns += [
         views.autocomplete_organization,
         name="autocomplete-organization",
     ),
-    url(r"admin-globalvar/", views.GlobalVarEdit.as_view(), name="admin-globalvar"),
+    # TODO v4: suppression
+    #url(r"admin-globalvar/", views.GlobalVarEdit.as_view(), name="admin-globalvar"),
     url(r"person-merge/(?:(?P<page>\d+)/)?$", views.person_merge, name="person_merge"),
     url(
         r"person-manual-merge/$",
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 98bded3ec..f9f84b533 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1252,13 +1252,15 @@ class GenerateLabelView(GenerateView):
             raise Http404()
         return objects
 
-
+"""
+# TODO v4: suppression
 class GlobalVarEdit(IshtarMixin, AdminLoginRequiredMixin, ModelFormSetView):
     template_name = "ishtar/formset.html"
     model = models.GlobalVar
     factory_kwargs = {"extra": 1, "can_delete": True}
     page_name = _("Global variables")
     fields = ["slug", "value", "description"]
+"""
 
 
 class NewImportView(IshtarMixin, LoginRequiredMixin, CreateView):