diff --git a/kairos/__init__.py b/kairos/__init__.py index 0cf83f4a276233991def4928b8ab2df607b149cc..ecb16009ce958f53ec6ca7ef776520b87225332f 100644 --- a/kairos/__init__.py +++ b/kairos/__init__.py @@ -63,4 +63,4 @@ TODO: """ -__version__ = '0.3.94' +__version__ = '0.3.95' diff --git a/mbr_news_plugin/cms_plugins.py b/mbr_news_plugin/cms_plugins.py index 7931c1a8308339f5608a007a4680db5f70389ddd..c6e92971c544dba8b7b3b87a9dad0d9d030b60bd 100644 --- a/mbr_news_plugin/cms_plugins.py +++ b/mbr_news_plugin/cms_plugins.py @@ -5,6 +5,7 @@ from cms.plugin_base import CMSPluginBase # ty from cms.plugin_pool import plugin_pool # type: ignore from cms.models.pluginmodel import CMSPlugin # type: ignore from django.db.models import CharField, F, Q, Value # type: ignore +from django.db.models.functions import Concat # type: ignore from mbr_announcements.models import MemberAnnouncement from mbr_announcements.views import EXC_ADD_MARKER, EXC_ANCHOR_ID_PREFIX @@ -31,7 +32,8 @@ class MemberNewsPlugin(CMSPluginBase): mes = MemberAnnouncement.objects.filter(~Q(ma_description__contains=EXC_ADD_MARKER)) # filter(~Q.. == exclude(Q mes = mes \ .annotate(news_id=F('pk'), member_pk=F('ma_user__pk'), phone=F('ma_user__last_name'), - news_date=F('ma_last_updated'), description=F('ma_description'), + news_date=F('ma_last_updated'), + description=Concat('ma_action', Value(": "), 'ma_description', output_field=CharField()), cat_name=F('ma_announce_category__ac_name')) \ .values('news_id', 'member_pk', 'phone', 'news_date', 'description', 'cat_name')