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

1 files changed, 14 insertions, 7 deletions

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)