refactor: rename hold_queue to suspend_email_queue

frappe · Jul 18, 2022 · 4b0a9da · 4b0a9da
1 parent 9a7f92c
commit 4b0a9da
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py
@@ -114,7 +114,7 @@ def can_send_now(self):
 		if (
 			frappe.are_emails_muted()
 			or not self.is_to_be_sent()
-			or cint(frappe.db.get_default("hold_queue")) == 1
+			or cint(frappe.db.get_default("suspend_email_queue")) == 1
 		):
 			return False
 
@@ -384,7 +384,7 @@ def send_now(name):
 @frappe.whitelist()
 def toggle_sending(enable):
 	frappe.only_for("System Manager")
-	frappe.db.set_default("hold_queue", 0 if sbool(enable) else 1)
+	frappe.db.set_default("suspend_email_queue", 0 if sbool(enable) else 1)
 
 
 def on_doctype_update():

diff --git a/frappe/email/doctype/email_queue/email_queue_list.js b/frappe/email/doctype/email_queue/email_queue_list.js
@@ -15,7 +15,7 @@ function show_toggle_sending_button(list_view) {
 	if (!has_common(frappe.user_roles, ["Administrator", "System Manager"]))
 		return;
 
-	const sending_disabled = cint(frappe.sys_defaults.hold_queue);
+	const sending_disabled = cint(frappe.sys_defaults.suspend_email_queue);
 	const label = sending_disabled ? __("Resume Sending") : __("Suspend Sending");
 
 	list_view.page.add_inner_button(
@@ -28,8 +28,8 @@ function show_toggle_sending_button(list_view) {
 				{enable: sending_disabled}
 			);
 
-			// set new value for hold_queue in sys_defaults
-			frappe.sys_defaults.hold_queue = sending_disabled ? 0 : 1;
+			// set new value for suspend_email_queue in sys_defaults
+			frappe.sys_defaults.suspend_email_queue = sending_disabled ? 0 : 1;
 
 			// clear the button and show one with the opposite label
 			list_view.page.remove_inner_button(label);

diff --git a/frappe/email/queue.py b/frappe/email/queue.py
@@ -148,7 +148,7 @@ def flush(from_test=False):
 		msgprint(_("Emails are muted"))
 		from_test = True
 
-	if cint(frappe.db.get_default("hold_queue")) == 1:
+	if cint(frappe.db.get_default("suspend_email_queue")) == 1:
 		return
 
 	for row in get_queue():

diff --git a/frappe/patches.txt b/frappe/patches.txt
@@ -205,4 +205,4 @@ frappe.patches.v14_0.update_auto_account_deletion_duration
 frappe.patches.v14_0.update_integration_request
 frappe.patches.v14_0.set_document_expiry_default
 frappe.patches.v14_0.delete_data_migration_tool
-frappe.patches.v14_0.set_hold_queue_default
+frappe.patches.v14_0.set_suspend_email_queue_default
diff --git a/...e/patches/v14_0/set_hold_queue_default.py → .../v14_0/set_suspend_email_queue_default.py b/...e/patches/v14_0/set_hold_queue_default.py → .../v14_0/set_suspend_email_queue_default.py
@@ -4,17 +4,10 @@
 
 def execute():
 	frappe.db.set_default(
-		"hold_queue",
+		"suspend_email_queue",
 		frappe.db.get_default("hold_queue", "Administrator") or 0,
 		parent="__default",
 	)
 
-	frappe.db.delete(
-		"DefaultValue",
-		{
-			"defkey": "hold_queue",
-			"parent": ("!=", "__default"),
-		},
-	)
-
+	frappe.db.delete("DefaultValue", {"defkey": "hold_queue"})
 	clear_defaults_cache()