diff --git a/frappe/tests/test_base_document.py b/frappe/tests/test_base_document.py
index fda795b5b6..a861b3454b 100644
--- a/frappe/tests/test_base_document.py
+++ b/frappe/tests/test_base_document.py
@@ -5,7 +5,7 @@ from frappe.model.base_document import BaseDocument
class TestBaseDocument(unittest.TestCase):
def test_docstatus(self):
- doc = BaseDocument({"docstatus": 0})
+ doc = BaseDocument({"docstatus": 0, "doctype": "ToDo"})
self.assertTrue(doc.docstatus.is_draft())
self.assertEqual(doc.docstatus, 0)
diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py
index 19a8c445f8..dd67d68cd2 100644
--- a/frappe/tests/test_db_query.py
+++ b/frappe/tests/test_db_query.py
@@ -692,6 +692,29 @@ class TestReportview(unittest.TestCase):
dt.delete()
table_dt.delete()
+ def test_permission_query_condition(self):
+ from frappe.desk.doctype.dashboard_settings.dashboard_settings import create_dashboard_settings
+
+ self.doctype = "Dashboard Settings"
+ self.user = "test'5@example.com"
+
+ permission_query_conditions = DatabaseQuery.get_permission_query_conditions(self)
+
+ create_dashboard_settings(self.user)
+
+ dashboard_settings = frappe.db.sql(
+ """
+ SELECT name
+ FROM `tabDashboard Settings`
+ WHERE {condition}
+ """.format(
+ condition=permission_query_conditions
+ ),
+ as_dict=1,
+ )[0]
+
+ self.assertTrue(dashboard_settings)
+
def add_child_table_to_blog_post():
child_table = frappe.get_doc(
diff --git a/frappe/tests/test_deferred_insert.py b/frappe/tests/test_deferred_insert.py
new file mode 100644
index 0000000000..4f27bef4f0
--- /dev/null
+++ b/frappe/tests/test_deferred_insert.py
@@ -0,0 +1,12 @@
+import frappe
+from frappe.deferred_insert import deferred_insert, save_to_db
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestDeferredInsert(FrappeTestCase):
+ def test_deferred_insert(self):
+ route_history = {"route": frappe.generate_hash(), "user": "Administrator"}
+ deferred_insert("Route History", [route_history])
+
+ save_to_db()
+ self.assertTrue(frappe.db.exists("Route History", route_history))
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 40bc8e2d45..5bda6a1d9d 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -341,3 +341,19 @@ class TestDocument(unittest.TestCase):
# run_method should get overridden
self.assertEqual(doc.run_method("as_dict"), "success")
+
+ def test_extend(self):
+ doc = frappe.get_last_doc("User")
+ self.assertRaises(ValueError, doc.extend, "user_emails", None)
+
+ # allow calling doc.extend with iterable objects
+ doc.extend("user_emails", ())
+ doc.extend("user_emails", [])
+ doc.extend("user_emails", (x for x in ()))
+
+ def test_set(self):
+ doc = frappe.get_last_doc("User")
+
+ # setting None should init a table field to empty list
+ doc.set("user_emails", None)
+ self.assertEqual(doc.user_emails, [])
diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py
index abbcda5c4c..7b54df2d51 100644
--- a/frappe/workflow/doctype/workflow_action/workflow_action.py
+++ b/frappe/workflow/doctype/workflow_action/workflow_action.py
@@ -53,9 +53,12 @@ def get_permission_query_conditions(user):
.where(WorkflowActionPermittedRole.role.isin(roles))
).get_sql()
- return f"""(`tabWorkflow Action`.`name` in ({permitted_workflow_actions})
- or `tabWorkflow Action`.`user`='{user}')
- and `tabWorkflow Action`.`status`='Open'"""
+ return """(`tabWorkflow Action`.`name` in ({permitted_workflow_actions})
+ or `tabWorkflow Action`.`user`={user})
+ and `tabWorkflow Action`.`status`='Open'
+ """.format(
+ permitted_workflow_actions=permitted_workflow_actions, user=frappe.db.escape(user)
+ )
def has_permission(doc, user):
diff --git a/frappe/www/login.html b/frappe/www/login.html
index 927f451965..1aaaf85656 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -7,7 +7,7 @@