Procházet zdrojové kódy

[minor] display title in user mention instead of docname (#4217)

* [minor] display title in user mention instead of docname

* [minor] added the reference number/name

* [minor] if title is name then use the doc.reference_name instead of frappe.db.get_value
version-14
Makarand Bauskar před 7 roky
committed by Rushabh Mehta
rodič
revize
a6ed912924
2 změnil soubory, kde provedl 12 přidání a 2 odebrání
  1. +11
    -1
      frappe/core/doctype/communication/comment.py
  2. +1
    -1
      frappe/model/meta.py

+ 11
- 1
frappe/core/doctype/communication/comment.py Zobrazit soubor

@@ -81,7 +81,17 @@ def notify_mentions(doc):
return return


sender_fullname = get_fullname(frappe.session.user) sender_fullname = get_fullname(frappe.session.user)
parent_doc_label = "{0} {1}".format(_(doc.reference_doctype), doc.reference_name)
title_field = frappe.get_meta(doc.reference_doctype).get_title_field()
title = doc.reference_name if title_field == "name" else \
frappe.db.get_value(doc.reference_doctype, doc.reference_name, title_field)

if title != doc.reference_name:
parent_doc_label = "{0}: {1} (#{2})".format(_(doc.reference_doctype),
title, doc.reference_name)
else:
parent_doc_label = "{0}: {1}".format(_(doc.reference_doctype),
doc.reference_name)

subject = _("{0} mentioned you in a comment").format(sender_fullname) subject = _("{0} mentioned you in a comment").format(sender_fullname)


recipients = [frappe.db.get_value("User", {"enabled": 1, "username": username, "user_type": "System User"}) recipients = [frappe.db.get_value("User", {"enabled": 1, "username": username, "user_type": "System User"})


+ 1
- 1
frappe/model/meta.py Zobrazit soubor

@@ -218,7 +218,7 @@ class Meta(Document):
title_field = getattr(self, 'title_field', None) title_field = getattr(self, 'title_field', None)
if not title_field and self.has_field('title'): if not title_field and self.has_field('title'):
title_field = 'title' title_field = 'title'
else:
if not title_field:
title_field = 'name' title_field = 'name'


return title_field return title_field


Načítá se…
Zrušit
Uložit