diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 0074096..d476d73 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -139,6 +139,15 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): admin.site.register(StaticPage,Admin_StaticPage) class Admin_Block(Admin_Trans_BaseModelViewPage): + + def obj_name(self, obj): + try: + return obj.content_object + except Exception as e: + return obj.content_object.id + obj_name.short_description = _('Название') + obj_name.allow_tags = True + fieldsets = [ (None, { 'classes': [], @@ -160,10 +169,13 @@ class Admin_Block(Admin_Trans_BaseModelViewPage): inlines = [Admin_Inline_WidgetForBlock] - list_display = ['name', 'block_type', 'enable', 'content_type', 'object_id', 'order'] + list_display = [ + 'name', 'block_type', 'enable', 'content_type', 'content_object', 'order', + 'object_id', 'createDT', 'modifiedDT' + ] list_editable = ['enable', 'order'] search_fields = ['name'] - list_filter = ['block_type', 'enable', 'content_type'] + list_filter = ['enable', 'content_type', 'block_type'] def has_delete_permission(self, request, obj=None): if request.user.is_superuser: