test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show notification_text in notification panel

Browse Source
This commit is contained in:
Shariq Ansari 2024-04-25 14:22:04 +05:30
parent b910045b25
commit 7b08359624
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crm/api/comment.py
View File

@ -1,4 +1,5 @@
import frappe
from frappe import _
from bs4 import BeautifulSoup
def on_update(self, method):
@ -15,13 +16,30 @@ def notify_mentions(doc):
return
mentions = extract_mentions(content)
for mention in mentions:
owner = frappe.get_cached_value("User", doc.owner, "full_name")
doctype = doc.reference_doctype
if doctype.startswith("CRM "):
doctype = doctype[4:].lower()
notification_text = f"""
<div class="mb-2 space-x-1 leading-5 text-gray-600">
<span class="font-medium text-gray-900">
{ owner }
</span>
<span>{ _('mentioned you in {0}').format(doctype) }</span>
<span class="font-medium text-gray-900">
{ doc.reference_name }
</span>
</div>
"""
values = frappe._dict(
doctype="CRM Notification",
from_user=doc.owner,
to_user=mention.email,
type="Mention",
message=doc.content,
comment=doc.name,
notification_text=notification_text,
notification_type_doctype="Comment",
notification_type_doc=doc.name,
reference_doctype=doc.reference_doctype,
reference_name=doc.reference_name,
)

3
crm/api/notifications.py
View File

@ -28,6 +28,9 @@ def get_notifications():
"to_user": notification.to_user,
"read": notification.read,
"comment": notification.comment,
"notification_text": notification.notification_text,
"notification_type_doctype": notification.notification_type_doctype,
"notification_type_doc": notification.notification_type_doc,
"reference_doctype": "deal"
if notification.reference_doctype == "CRM Deal"
else "lead",

9
frontend/src/components/Notifications.vue
View File

@ -58,11 +58,14 @@
<UserAvatar :user="n.from_user.name" size="lg" />
</div>
<div>
<div class="mb-2 space-x-1 leading-5 text-gray-600">
<div v-if="n.notification_text" v-html="n.notification_text" />
<div v-else class="mb-2 space-x-1 leading-5 text-gray-600">
<span class="font-medium text-gray-900">
{{ n.from_user.full_name }}
</span>
<span>{{ __('mentioned you in {0}', [n.reference_doctype]) }}</span>
<span>
{{ __('mentioned you in {0}', [n.reference_doctype]) }}
</span>
<span class="font-medium text-gray-900">
{{ n.reference_name }}
</span>
@ -128,7 +131,7 @@ function getRoute(notification) {
return {
name: notification.route_name,
params: params,
hash: '#' + notification.comment,
hash: '#' + notification.comment || notification.notification_type_doc,
}
}
</script>