Browse Source

Merge pull request #16153 from ChillarAnand/tests

version-14
Suraj Shetty 3 years ago
committed by GitHub
parent
commit
19c3fd923b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
  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 View File

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



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


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



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


+ 2
- 1
frappe/social/doctype/energy_point_log/energy_point_log.py View File

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


return alert_dict return alert_dict



def create_energy_points_log(ref_doctype, ref_name, doc, apply_only_once=False): def create_energy_points_log(ref_doctype, ref_name, doc, apply_only_once=False):
doc = frappe._dict(doc) 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) ref_name, doc.rule, None if apply_only_once else doc.user)


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


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


+ 0
- 2
frappe/tests/test_utils.py View File

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



Loading…
Cancel
Save