From 51ecce692705a80738410449eec5cbcd1583d24d Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 1 Jul 2025 11:59:23 +0200
Subject: [PATCH] More updates

---
 .../src/components/webmail/MailboxList.vue    |  8 ++++-
 modoboa/admin/app_settings.py                 |  2 +-
 modoboa/autoreply/apps.py                     |  2 +-
 modoboa/calendars/app_settings.py             |  2 +-
 modoboa/contacts/app_settings.py              |  2 +-
 modoboa/core/apps.py                          |  2 +-
 modoboa/dmarc/forms.py                        |  2 +-
 modoboa/imap_migration/apps.py                |  2 +-
 .../lib/migrations/0007_auto_20250701_0921.py | 36 +++++++++++++++++++
 modoboa/limits/apps.py                        |  2 +-
 modoboa/maillog/apps.py                       |  2 +-
 modoboa/parameters/tools.py                   |  2 +-
 modoboa/pdfcredentials/apps.py                |  2 +-
 modoboa/rspamd/apps.py                        |  2 +-
 modoboa/sievefilters/apps.py                  |  2 +-
 modoboa/webmail/app_settings.py               |  4 +--
 16 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 modoboa/lib/migrations/0007_auto_20250701_0921.py

diff --git a/frontend/src/components/webmail/MailboxList.vue b/frontend/src/components/webmail/MailboxList.vue
index caf8b47b8..55f90e846 100644
--- a/frontend/src/components/webmail/MailboxList.vue
+++ b/frontend/src/components/webmail/MailboxList.vue
@@ -14,7 +14,13 @@
         @mouseleave="setHover(mailbox, false)"
       >
         <v-icon :icon="iconByMailboxType[mailbox.type]" class="mr-4" />
-        <template v-if="props.unseenCounters && mailbox.unseen > 0">
+        <template
+          v-if="
+            props.unseenCounters &&
+            mailbox.unseen > 0 &&
+            currentMailboxUnseen > 0
+          "
+        >
           <span
             v-if="mailbox.name === route.query.mailbox"
             class="font-weight-bold"
diff --git a/modoboa/admin/app_settings.py b/modoboa/admin/app_settings.py
index 6047dbbfd..f7ebec3ad 100644
--- a/modoboa/admin/app_settings.py
+++ b/modoboa/admin/app_settings.py
@@ -281,7 +281,7 @@ def load_admin_settings():
     from .api.v2 import serializers
 
     structure = init_structure()
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "admin",
         gettext_lazy("Administration"),
diff --git a/modoboa/autoreply/apps.py b/modoboa/autoreply/apps.py
index 48da4f013..0b61f95e7 100644
--- a/modoboa/autoreply/apps.py
+++ b/modoboa/autoreply/apps.py
@@ -9,7 +9,7 @@ def load_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "autoreply",
         gettext_lazy("Automatic replies"),
diff --git a/modoboa/calendars/app_settings.py b/modoboa/calendars/app_settings.py
index 9c5cba2c2..2f13fba7b 100644
--- a/modoboa/calendars/app_settings.py
+++ b/modoboa/calendars/app_settings.py
@@ -83,7 +83,7 @@ def load_settings():
     from modoboa.parameters import tools as param_tools
     from modoboa.calendars import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "calendars",
         gettext_lazy("Calendars"),
diff --git a/modoboa/contacts/app_settings.py b/modoboa/contacts/app_settings.py
index 4570d8aa0..835376ec4 100644
--- a/modoboa/contacts/app_settings.py
+++ b/modoboa/contacts/app_settings.py
@@ -45,7 +45,7 @@ def load_settings():
     from modoboa.parameters import tools as param_tools
     from modoboa.contacts import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "user",
         "contacts",
         gettext_lazy("Contacts"),
diff --git a/modoboa/core/apps.py b/modoboa/core/apps.py
index 9c4aa709c..3f48a6f4f 100644
--- a/modoboa/core/apps.py
+++ b/modoboa/core/apps.py
@@ -15,7 +15,7 @@ def load_core_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "core",
         gettext_lazy("General"),
diff --git a/modoboa/dmarc/forms.py b/modoboa/dmarc/forms.py
index c2fd20339..6efb39a3c 100644
--- a/modoboa/dmarc/forms.py
+++ b/modoboa/dmarc/forms.py
@@ -36,7 +36,7 @@ def load_settings():
     """Load app settings."""
     from modoboa.parameters import tools as param_tools
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "dmarc",
         _("DMARC"),
diff --git a/modoboa/imap_migration/apps.py b/modoboa/imap_migration/apps.py
index b6465f2a2..a48e86aff 100644
--- a/modoboa/imap_migration/apps.py
+++ b/modoboa/imap_migration/apps.py
@@ -14,7 +14,7 @@ def load_imapmigration_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "imap_migration",
         gettext_lazy("IMAP Migration"),
diff --git a/modoboa/lib/migrations/0007_auto_20250701_0921.py b/modoboa/lib/migrations/0007_auto_20250701_0921.py
new file mode 100644
index 000000000..ed02aafeb
--- /dev/null
+++ b/modoboa/lib/migrations/0007_auto_20250701_0921.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.22 on 2025-07-01 09:21
+
+from django.db import migrations
+
+
+APPS_MAP = {
+    "modoboa_radicale": "calendars",
+    "modoboa_webmail": "webmail",
+    "modoboa_rspamd": "rspamd",
+    "modoboa_sievefilters": "sievefilters",
+    "modoboa_postfix_autoreply": "autoreply",
+}
+
+
+def rename_param_apps(apps, schema_editor):
+    LocalConfig = apps.get_model("core", "LocalConfig")
+    lc = LocalConfig.objects.first()
+    if not lc:
+        return
+    for old_name, new_name in APPS_MAP.items():
+        if old_name not in lc._parameters:
+            continue
+        lc._parameters[new_name] = lc._parameters[old_name]
+        del lc._parameters[old_name]
+    lc.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("lib", "0006_auto_20161104_2206"),
+    ]
+
+    operations = [
+        migrations.RunPython(rename_param_apps, migrations.RunPython.noop),
+    ]
diff --git a/modoboa/limits/apps.py b/modoboa/limits/apps.py
index da6c19162..5ffac943a 100644
--- a/modoboa/limits/apps.py
+++ b/modoboa/limits/apps.py
@@ -10,7 +10,7 @@ def load_limits_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "limits",
         _("Limits"),
diff --git a/modoboa/maillog/apps.py b/modoboa/maillog/apps.py
index 32be84cf4..dfdd66131 100644
--- a/modoboa/maillog/apps.py
+++ b/modoboa/maillog/apps.py
@@ -54,7 +54,7 @@ def load_maillog_settings():
     from modoboa.maillog.api.v2 import serializers
     from modoboa.parameters import tools as param_tools
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "maillog",
         gettext("Statistics"),
diff --git a/modoboa/parameters/tools.py b/modoboa/parameters/tools.py
index 6ad51bef1..6e3308b97 100644
--- a/modoboa/parameters/tools.py
+++ b/modoboa/parameters/tools.py
@@ -30,7 +30,7 @@ class Registry:
         """Constructor."""
         self._registry2 = {"global": {}, "user": {}}
 
-    def add2(
+    def add(
         self,
         level: str,
         app: str,
diff --git a/modoboa/pdfcredentials/apps.py b/modoboa/pdfcredentials/apps.py
index c7f4729c8..4552f3695 100644
--- a/modoboa/pdfcredentials/apps.py
+++ b/modoboa/pdfcredentials/apps.py
@@ -15,7 +15,7 @@ def load_pdfcredential_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "pdfcredentials",
         gettext_lazy("PDF Credentials"),
diff --git a/modoboa/rspamd/apps.py b/modoboa/rspamd/apps.py
index ca561a0e3..71112c1ff 100644
--- a/modoboa/rspamd/apps.py
+++ b/modoboa/rspamd/apps.py
@@ -12,7 +12,7 @@ def load_rspamd_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "rspamd",
         gettext_lazy("Rspamd"),
diff --git a/modoboa/sievefilters/apps.py b/modoboa/sievefilters/apps.py
index d0b15c597..b7b9f9a30 100644
--- a/modoboa/sievefilters/apps.py
+++ b/modoboa/sievefilters/apps.py
@@ -9,7 +9,7 @@ def load_settings():
     from . import app_settings
     from .api.v2 import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "sievefilters",
         gettext_lazy("Sieve filters"),
diff --git a/modoboa/webmail/app_settings.py b/modoboa/webmail/app_settings.py
index fa39383ea..d9d59ccda 100644
--- a/modoboa/webmail/app_settings.py
+++ b/modoboa/webmail/app_settings.py
@@ -252,14 +252,14 @@ def load_settings():
     from modoboa.parameters import tools as param_tools
     from modoboa.webmail import serializers
 
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "global",
         "webmail",
         gettext_lazy("Webmail"),
         GLOBAL_PARAMETERS_STRUCT,
         serializers.GlobalParametersSerializer,
     )
-    param_tools.registry.add2(
+    param_tools.registry.add(
         "user",
         "webmail",
         gettext_lazy("Webmail"),