Merge pull request #26241 from frappe/version-15-hotfix

chore: release v15
frappe · Apr 30, 2024 · b050ce8 · b050ce8
2 parents 1a18956 + a1f008c
commit b050ce8
Show file tree

Hide file tree

Showing 57 changed files with 490 additions and 529 deletions.
diff --git a/cypress/integration/control_duration.js b/cypress/integration/control_duration.js
@@ -20,11 +20,14 @@ context("Control Duration", () => {
 
 	it("should set duration", () => {
 		get_dialog_with_duration().as("dialog");
+		cy.wait(500);
 		cy.get(".frappe-control[data-fieldname=duration] input").first().click();
 		cy.get(".duration-input[data-duration=days]")
 			.type(45, { force: true })
 			.blur({ force: true });
+		cy.wait(500);
 		cy.get(".duration-input[data-duration=minutes]").type(30).blur({ force: true });
+		cy.wait(500);
 		cy.get(".frappe-control[data-fieldname=duration] input")
 			.first()
 			.should("have.value", "45d 30m");

diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js
diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js
diff --git a/cypress/integration/first_day_of_the_week.js b/cypress/integration/first_day_of_the_week.js
diff --git a/cypress/integration/list_view_drag_select.js b/cypress/integration/list_view_drag_select.js
diff --git a/frappe/__init__.py b/frappe/__init__.py
@@ -500,7 +500,7 @@ def print_sql(enable: bool = True) -> None:
 
 
 def log(msg: str) -> None:
-	"""Add to `debug_log`.
+	"""Add to `debug_log`
 
 	:param msg: Message."""
 	if not request:

diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json
@@ -7,7 +7,8 @@
  "field_order": [
   "status",
   "scheduled_job_type",
-  "details"
+  "details",
+  "debug_log"
  ],
  "fields": [
   {
@@ -35,10 +36,16 @@
    "options": "Scheduled Job Type",
    "read_only": 1,
    "reqd": 1
+  },
+  {
+   "fieldname": "debug_log",
+   "fieldtype": "Code",
+   "label": "Debug Log",
+   "read_only": 1
   }
  ],
  "links": [],
- "modified": "2022-06-13 05:41:21.090972",
+ "modified": "2023-11-09 12:06:41.781270",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Scheduled Job Log",

diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.py b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.py
@@ -16,6 +16,7 @@ class ScheduledJobLog(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		debug_log: DF.Code | None
 		details: DF.Code | None
 		scheduled_job_type: DF.Link
 		status: DF.Literal["Scheduled", "Complete", "Failed"]

diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
@@ -164,6 +164,8 @@ def update_scheduler_log(self, status):
 				dict(doctype="Scheduled Job Log", scheduled_job_type=self.name)
 			).insert(ignore_permissions=True)
 		self.scheduler_log.db_set("status", status)
+		if frappe.debug_log:
+			self.scheduler_log.db_set("debug_log", "\n".join(frappe.debug_log))
 		if status == "Failed":
 			self.scheduler_log.db_set("details", frappe.get_traceback(with_context=True))
 		if status == "Start":

diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py
@@ -11,6 +11,7 @@
 import frappe
 import frappe.exceptions
 from frappe.core.doctype.user.user import (
+	User,
 	handle_password_test_fail,
 	reset_password,
 	sign_up,
@@ -475,7 +476,7 @@ def test_user(
 	try:
 		first_name = first_name or frappe.generate_hash()
 		email = email or (first_name + "@example.com")
-		user = frappe.new_doc(
+		user: User = frappe.new_doc(
 			"User",
 			send_welcome_email=0,
 			email=email,

diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
@@ -286,7 +286,7 @@ frappe.ui.form.on("User", {
 			frm.set_df_property("enabled", "read_only", 0);
 		}
 
-		if (frappe.session.user !== "Administrator") {
+		if (frm.doc.name !== "Administrator") {
 			frm.toggle_enable("email", frm.is_new());
 		}
 	},

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
@@ -152,7 +152,7 @@ def validate(self):
 			self.password_strength_test()
 
 		if self.name not in STANDARD_USERS:
-			self.validate_email_type(self.email)
+			self.email = self.name
 			self.validate_email_type(self.name)
 		self.add_system_manager_role()
 		self.populate_role_profile_roles()