mam/mamweb
11
0
Fork 0
Code Issues Pull requests 11 Projects Wiki Activity Actions

Merge pull request 'Admin strxfrm mac' (!81) from strxfrm_pro_mac into master

Browse source 
Reviewed-on: #81
This commit is contained in:
Jonas Havelka 2025-01-07 18:30:51 +01:00
commit 9a11491dcc
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mamweb/admin.py
View file

@ -7,6 +7,7 @@ import locale
from django.contrib import admin from django.contrib import admin
from django.contrib.admin import AdminSite from django.contrib.admin import AdminSite
from django.contrib.flatpages.models import FlatPage from django.contrib.flatpages.models import FlatPage
import logging
# Note: we are renaming the original Admin and Form as we import them! # Note: we are renaming the original Admin and Form as we import them!
from django.contrib.flatpages.admin import FlatPageAdmin as FlatPageAdminOld from django.contrib.flatpages.admin import FlatPageAdmin as FlatPageAdminOld
@ -56,8 +57,13 @@ def get_app_list(self, request, app_label=None):
# Sort the models alphabetically within each app. # Sort the models alphabetically within each app.
try: # na macu nefunguje locale.strxfrm :-/ proto je tu try except block
for app in app_list: for app in app_list:
app['models'].sort(key=lambda x: locale.strxfrm(x['name'].lower())) app['models'].sort(key=lambda x: locale.strxfrm(x['name'].lower()))
except OSError as e:
# locale.strxfrm nefunguje na macu... :-/ -> neprovede se řazení
logger = logging.getLogger(__name__)
logger.error(e)
return app_list return app_list