Przeglądaj źródła

Merge pull request #4880 from rohitwaghchaure/wrong_communication_date

[Fix] Showing today's date as communication date for old emails in the popup
version-14
rohitwaghchaure 7 lat temu
committed by GitHub
rodzic
commit
7086cf8312
Nie znaleziono w bazie danych klucza dla tego podpisu ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 3 dodań i 2 usunięć
  1. +1
    -1
      frappe/desk/form/load.py
  2. +2
    -1
      frappe/public/js/frappe/views/communication.js

+ 1
- 1
frappe/desk/form/load.py Wyświetl plik

@@ -138,7 +138,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
'''Returns list of communications for a given document'''
if not fields:
fields = '''name, communication_type,
communication_medium, comment_type,
communication_medium, comment_type, communication_date,
content, sender, sender_full_name, creation, subject, delivery_status, _liked_by,
timeline_doctype, timeline_name,
reference_doctype, reference_name,


+ 2
- 1
frappe/public/js/frappe/views/communication.js Wyświetl plik

@@ -585,12 +585,13 @@ frappe.views.CommunicationComposer = Class.extend({
.replace(/&lt;meta[\s\S]*meta&gt;/g, '') // remove <meta> tags
.replace(/&lt;style[\s\S]*&lt;\/style&gt;/g, ''); // // remove <style> tags

var communication_date = last_email.communication_date || last_email.creation;
content = '<div><br></div>'
+ reply
+ "<br><!-- original-reply --><br>"
+ '<blockquote>' +
'<p>' + __("On {0}, {1} wrote:",
[frappe.datetime.global_date_format(last_email.communication_date) , last_email.sender]) + '</p>' +
[frappe.datetime.global_date_format(communication_date) , last_email.sender]) + '</p>' +
last_email_content +
'<blockquote>';
} else {


Ładowanie…
Anuluj
Zapisz