From 381c5ca3de96a9ae7c9b4f5a21deaf571ee592ff Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Mon, 3 Jun 2024 02:06:00 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Hezk=C3=A1=20jm=C3=A9na=20a=20po=C5=99ad?= =?UTF-8?q?=C3=AD=20aplikac=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aesop/apps.py | 2 +- api/apps.py | 1 + header_fotky/apps.py | 1 + mamweb/admin.py | 13 +++++++++++-- novinky/apps.py | 1 + odevzdavatko/apps.py | 1 + personalni/apps.py | 1 + seminar/apps.py | 7 +++++++ sifrovacka/apps.py | 1 + soustredeni/apps.py | 1 + treenode/apps.py | 1 + various/apps.py | 1 + vyroci/apps.py | 1 + vysledkovky/apps.py | 1 + 14 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 seminar/apps.py diff --git a/aesop/apps.py b/aesop/apps.py index 4e8b4787..d7dea2e3 100644 --- a/aesop/apps.py +++ b/aesop/apps.py @@ -3,6 +3,6 @@ Soubor sloužící k pojmenování a jiným nastavením djangovské aplikace. """ from django.apps import AppConfig - class AesopConfig(AppConfig): name = 'aesop' + verbose_name = 'Export do AESOPa' diff --git a/api/apps.py b/api/apps.py index 6a2bdbc4..a74c8c0e 100644 --- a/api/apps.py +++ b/api/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class ApiConfig(AppConfig): name = 'api' + verbose_name = 'Různá webová API' diff --git a/header_fotky/apps.py b/header_fotky/apps.py index 13f93ed4..9cf572ec 100644 --- a/header_fotky/apps.py +++ b/header_fotky/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class HeaderFotkyConfig(AppConfig): name = 'header_fotky' + verbose_name = 'Fotky v záhlaví' diff --git a/mamweb/admin.py b/mamweb/admin.py index 5d0351df..d905f186 100644 --- a/mamweb/admin.py +++ b/mamweb/admin.py @@ -42,8 +42,17 @@ def get_app_list(self, request, app_label=None): """ app_dict = self._build_app_dict(request, label=app_label) - # Sort the apps alphabetically. - app_list = sorted(app_dict.values(), key=lambda x: locale.strxfrm('!') if (x['name'] == "Seminar") else locale.strxfrm(x['name'].lower())) + aplikace_nahore = [ + 'seminar', + 'personalni', + 'novinky', + 'korektury', + 'various', + 'prednasky', + 'soustredeni', + ] + app_list = [app_dict[label] for label in aplikace_nahore] + [app_dict[label] for label in app_dict if label not in aplikace_nahore] + # Sort the models alphabetically within each app. for app in app_list: diff --git a/novinky/apps.py b/novinky/apps.py index 1b728573..92519305 100644 --- a/novinky/apps.py +++ b/novinky/apps.py @@ -3,3 +3,4 @@ from django.apps import AppConfig class NovinkyConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'novinky' + verbose_name = 'Novinky' diff --git a/odevzdavatko/apps.py b/odevzdavatko/apps.py index 95811247..d20e4a5a 100644 --- a/odevzdavatko/apps.py +++ b/odevzdavatko/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class OdevzdavatkoConfig(AppConfig): name = 'odevzdavatko' + verbose_name = 'Odevzdávátko' diff --git a/personalni/apps.py b/personalni/apps.py index 47ba22cc..a6ea47fa 100644 --- a/personalni/apps.py +++ b/personalni/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class PersonalniConfig(AppConfig): name = 'personalni' + verbose_name = 'Personální' # Má to nějaký použitelnější název? diff --git a/seminar/apps.py b/seminar/apps.py new file mode 100644 index 00000000..161a73f8 --- /dev/null +++ b/seminar/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig + +class SeminarConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'seminar' + verbose_name = 'Seminář' + diff --git a/sifrovacka/apps.py b/sifrovacka/apps.py index e9f34de6..edca3802 100644 --- a/sifrovacka/apps.py +++ b/sifrovacka/apps.py @@ -3,3 +3,4 @@ from django.apps import AppConfig class SifrovackaConfig(AppConfig): name = 'sifrovacka' + verbose_name = 'Šifrovačka' diff --git a/soustredeni/apps.py b/soustredeni/apps.py index a0a8dae5..3dd0b94e 100644 --- a/soustredeni/apps.py +++ b/soustredeni/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class SoustredeniConfig(AppConfig): name = 'soustredeni' + verbose_name = 'Soustředění' diff --git a/treenode/apps.py b/treenode/apps.py index 8e7df6fc..7e709e48 100644 --- a/treenode/apps.py +++ b/treenode/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class TreenodeConfig(AppConfig): name = 'treenode' + verbose_name = 'TreeNody' diff --git a/various/apps.py b/various/apps.py index bf6023f0..d1f6ad2e 100644 --- a/various/apps.py +++ b/various/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class VariousConfig(AppConfig): name = 'various' + verbose_name = 'Různé' diff --git a/vyroci/apps.py b/vyroci/apps.py index b30f5d73..0fb1491e 100644 --- a/vyroci/apps.py +++ b/vyroci/apps.py @@ -3,3 +3,4 @@ from django.apps import AppConfig class VyrociConfig(AppConfig): name = 'vyroci' + verbose_name = '30. výročí M&M' diff --git a/vysledkovky/apps.py b/vysledkovky/apps.py index de1c2bde..7b9a1e0f 100644 --- a/vysledkovky/apps.py +++ b/vysledkovky/apps.py @@ -6,3 +6,4 @@ from django.apps import AppConfig class VysledkovkyConfig(AppConfig): name = 'vysledkovky' + verbose_name = 'Výsledkovky' From c78b932587cc19e502c3a963d7d3e3b1d5042314 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Mon, 3 Jun 2024 03:02:06 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Oprava=20odhl=C3=A1=C5=A1en=C3=A9ho=20admin?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mamweb/admin.py b/mamweb/admin.py index d905f186..04d564cc 100644 --- a/mamweb/admin.py +++ b/mamweb/admin.py @@ -51,7 +51,8 @@ def get_app_list(self, request, app_label=None): 'prednasky', 'soustredeni', ] - app_list = [app_dict[label] for label in aplikace_nahore] + [app_dict[label] for label in app_dict if label not in aplikace_nahore] + # Odhlášený admin má prázdný app_dict :-/ + app_list = [app_dict[label] for label in aplikace_nahore if label in app_dict] + [app_dict[label] for label in app_dict if label not in aplikace_nahore] # Sort the models alphabetically within each app.