瀏覽代碼

Merge pull request #16153 from ChillarAnand/tests

version-14
Suraj Shetty 3 年之前
committed by GitHub
父節點
當前提交
19c3fd923b
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 3 個文件被更改,包括 7 次插入3 次删除
  1. +5
    -0
      frappe/desk/form/load.py
  2. +2
    -1
      frappe/social/doctype/energy_point_log/energy_point_log.py
  3. +0
    -2
      frappe/tests/test_utils.py

+ 5
- 0
frappe/desk/form/load.py 查看文件

@@ -11,8 +11,10 @@ from frappe.model.utils.user_settings import get_user_settings
from frappe.permissions import get_doc_permissions
from frappe.desk.form.document_follow import is_document_followed
from frappe import _
from frappe import _dict
from urllib.parse import quote


@frappe.whitelist()
def getdoc(doctype, name, user=None):
"""
@@ -50,8 +52,11 @@ def getdoc(doctype, name, user=None):

doc.add_seen()
set_link_titles(doc)
if frappe.response.docs is None:
frappe.response = _dict({"docs": []})
frappe.response.docs.append(doc)


@frappe.whitelist()
def getdoctype(doctype, with_parent=False, cached_timestamp=None):
"""load doctype"""


+ 2
- 1
frappe/social/doctype/energy_point_log/energy_point_log.py 查看文件

@@ -164,6 +164,7 @@ def get_alert_dict(doc):

return alert_dict


def create_energy_points_log(ref_doctype, ref_name, doc, apply_only_once=False):
doc = frappe._dict(doc)

@@ -171,7 +172,7 @@ def create_energy_points_log(ref_doctype, ref_name, doc, apply_only_once=False):
ref_name, doc.rule, None if apply_only_once else doc.user)

if log_exists:
return
return frappe.get_doc('Energy Point Log', log_exists)

new_log = frappe.new_doc('Energy Point Log')
new_log.reference_doctype = ref_doctype


+ 0
- 2
frappe/tests/test_utils.py 查看文件

@@ -510,5 +510,3 @@ class TestLinkTitle(unittest.TestCase):
todo.delete()
user.delete()
prop_setter.delete()



Loading…
取消
儲存