Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use frappe.utils.md_to_html instead of manual import (#15087)

Browse Source
This commit is contained in:
Faris Ansari 2018-08-07 11:53:36 +05:30 committed by Nabin Hait
parent 2cadb1e12e
commit 796ca56f85
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py
View File

@ -5,7 +5,7 @@ def pre_process(issue):
project = frappe.db.get_value('Project', filters={'project_name': issue.milestone}) project = frappe.db.get_value('Project', filters={'project_name': issue.milestone})
return { return {
'title': issue.title, 'title': issue.title,
'body': frappe.utils.to_html(issue.body or ''), 'body': frappe.utils.md_to_html(issue.body or ''),
'state': issue.state.title(), 'state': issue.state.title(),
'project': project or '' 'project': project or ''
} }

3
erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
View File

@ -9,7 +9,6 @@ from frappe import _
from email_reply_parser import EmailReplyParser from email_reply_parser import EmailReplyParser
from erpnext.hr.doctype.employee.employee import is_holiday from erpnext.hr.doctype.employee.employee import is_holiday
from frappe.utils import global_date_format from frappe.utils import global_date_format
from markdown2 import markdown
class DailyWorkSummary(Document): class DailyWorkSummary(Document):
@ -88,7 +87,7 @@ class DailyWorkSummary(Document):
if d.sender in did_not_reply: if d.sender in did_not_reply:
did_not_reply.remove(d.sender) did_not_reply.remove(d.sender)
if d.text_content: if d.text_content:
d.content = markdown( d.content = frappe.utils.md_to_html(
EmailReplyParser.parse_reply(d.text_content) EmailReplyParser.parse_reply(d.text_content)
) )

3
erpnext/hr/page/team_updates/team_updates.py
View File

@ -2,7 +2,6 @@ from __future__ import unicode_literals
import frappe import frappe
from email_reply_parser import EmailReplyParser from email_reply_parser import EmailReplyParser
from markdown2 import markdown
@frappe.whitelist() @frappe.whitelist()
def get_data(start=0): def get_data(start=0):
@ -16,6 +15,6 @@ def get_data(start=0):
d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender}, d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender},
"employee_name") or d.sender "employee_name") or d.sender
if d.text_content: if d.text_content:
d.content = markdown(EmailReplyParser.parse_reply(d.text_content)) d.content = frappe.utils.md_to_html(EmailReplyParser.parse_reply(d.text_content))
return data return data

3
erpnext/setup/setup_wizard/operations/sample_data.py
View File

@ -8,7 +8,6 @@ from frappe.utils.make_random import add_random_children
import frappe.utils import frappe.utils
import random, os, json import random, os, json
from frappe import _ from frappe import _
from markdown2 import markdown
def make_sample_data(domains, make_dependent = False): def make_sample_data(domains, make_dependent = False):
"""Create a few opportunities, quotes, material requests, issues, todos, projects """Create a few opportunities, quotes, material requests, issues, todos, projects
@ -152,7 +151,7 @@ def make_projects(domains):
for t in tasks: for t in tasks:
with open (os.path.join(os.path.dirname(__file__), "tasks", t['file'])) as f: with open (os.path.join(os.path.dirname(__file__), "tasks", t['file'])) as f:
t['description'] = markdown(f.read()) t['description'] = frappe.utils.md_to_html(f.read())
del t['file'] del t['file']
project.append('tasks', t) project.append('tasks', t)