From 96c987870ec60a1f9455255e873f0d1cad03748f Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Fri, 30 Jun 2023 14:27:10 +0530 Subject: [PATCH 01/81] fix: support timespan filters for custom dashboard chart source --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 - frappe/public/js/frappe/widgets/chart_widget.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 6d23be79d7..5ed71e91a8 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -48,7 +48,6 @@ frappe.ui.form.on("Dashboard Chart", { frm.set_df_property("dynamic_filters_section", "hidden", 1); frm.trigger("set_parent_document_type"); - frm.trigger("set_time_series"); frm.set_query("document_type", function () { return { filters: { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 18f7459a6c..ed40789173 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -103,7 +103,7 @@ export default class ChartWidget extends Widget { this.action_area.empty(); this.prepare_chart_actions(); - if (this.chart_doc.timeseries && this.chart_doc.chart_type !== "Custom") { + if (this.chart_doc.timeseries) { this.render_time_series_filters(); } } From 8b7ed91c39aeef833b34d22a611bef5ab4a91e1d Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Fri, 28 Jul 2023 14:52:45 +0530 Subject: [PATCH 02/81] fix: Made Set Password Page Better --- frappe/www/update-password.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 7351311def..707bc21e09 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -84,6 +84,7 @@ frappe.ready(function() { if (args.new_password !== confirm_password) { $('.password-mismatch-message').text("{{ _('Passwords do not match') }}") .removeClass('hidden text-muted').addClass('text-danger'); + $('.password-strength-message').addClass('hidden'); return false; } @@ -198,6 +199,7 @@ frappe.ready(function() { message.push("{{ _('Success! You are good to go đź‘Ť') }}"); } } + $('.password-mismatch-message').text("").addClass('hidden'); strength_message.html(message.join(' ') || '').removeClass('hidden'); } From d0c1152d0e2bb102521bffb24fab540f1bcdfd42 Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Fri, 28 Jul 2023 15:02:40 +0530 Subject: [PATCH 03/81] refactor: refactored the code --- frappe/www/update-password.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 707bc21e09..b78913cc97 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -199,7 +199,8 @@ frappe.ready(function() { message.push("{{ _('Success! You are good to go đź‘Ť') }}"); } } - $('.password-mismatch-message').text("").addClass('hidden'); + $('.password-mismatch-message').addClass('hidden'); + strength_message.html(message.join(' ') || '').removeClass('hidden'); } From 213d744661651ec8bb12066c56754c9b6858ce13 Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Sun, 30 Jul 2023 18:25:10 +0530 Subject: [PATCH 04/81] fix: better UX --- frappe/www/update-password.html | 47 ++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index b78913cc97..5a50d8d71d 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -26,7 +26,7 @@ - {%- if not disable_signup -%} @@ -43,6 +43,7 @@ Comment" - frappe.form_dict.comment_by = "hacker" - - add_comment() - + add_comment_args.update(comment="Comment", comment_by="hacker") + add_comment(**add_comment_args) self.assertEqual( frappe.get_all( "Comment", @@ -106,27 +93,30 @@ class TestComment(FrappeTestCase): def test_guest_cannot_comment(self): test_blog = make_test_blog() with set_user("Guest"): - frappe.form_dict.comment = "Good comment with 10 chars" - frappe.form_dict.comment_email = "mail@example.org" - frappe.form_dict.comment_by = "Good Tester" - frappe.form_dict.reference_doctype = "Blog Post" - frappe.form_dict.reference_name = test_blog.name - frappe.form_dict.route = test_blog.route - frappe.local.request_ip = "127.0.0.1" - - self.assertEqual(add_comment(), None) + self.assertEqual( + add_comment( + comment="Good comment with 10 chars", + comment_email="mail@example.org", + comment_by="Good Tester", + reference_doctype="Blog Post", + reference_name=test_blog.name, + route=test_blog.route, + ), + None, + ) def test_user_not_logged_in(self): - some_system_user = frappe.db.get_value("User", {}) + some_system_user = frappe.db.get_value("User", {"name": ("not in", frappe.STANDARD_USERS)}) test_blog = make_test_blog() with set_user("Guest"): - frappe.form_dict.comment = "Good comment with 10 chars" - frappe.form_dict.comment_email = some_system_user - frappe.form_dict.comment_by = "Good Tester" - frappe.form_dict.reference_doctype = "Blog Post" - frappe.form_dict.reference_name = test_blog.name - frappe.form_dict.route = test_blog.route - frappe.local.request_ip = "127.0.0.1" - - self.assertRaises(frappe.ValidationError, add_comment) + self.assertRaises( + frappe.ValidationError, + add_comment, + comment="Good comment with 10 chars", + comment_email=some_system_user, + comment_by="Good Tester", + reference_doctype="Blog Post", + reference_name=test_blog.name, + route=test_blog.route, + ) diff --git a/frappe/tests/utils.py b/frappe/tests/utils.py index c6c53e6bf5..a98801c503 100644 --- a/frappe/tests/utils.py +++ b/frappe/tests/utils.py @@ -149,6 +149,9 @@ def _restore_thread_locals(flags): frappe.local.lang = "en" frappe.local.preload_assets = {"style": [], "script": []} + if hasattr(frappe.local, "request"): + delattr(frappe.local, "request") + @contextmanager def change_settings(doctype, settings_dict): diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 3ea447d90c..f0a5fb0295 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -20,6 +20,10 @@ class TestBlogPost(FrappeTestCase): def setUp(self): reset_customization("Blog Post") + def tearDown(self): + if hasattr(frappe.local, "request"): + delattr(frappe.local, "request") + def test_generator_view(self): pages = frappe.get_all( "Blog Post", fields=["name", "route"], filters={"published": 1, "route": ("!=", "")}, limit=1 @@ -159,17 +163,10 @@ class TestBlogPost(FrappeTestCase): from frappe.templates.includes.likes.likes import like - frappe.form_dict.reference_doctype = "Blog Post" - frappe.form_dict.reference_name = test_blog.name - frappe.form_dict.like = True - frappe.local.request_ip = "127.0.0.1" - - liked = like() + liked = like("Blog Post", test_blog.name, True) self.assertEqual(liked, True) - frappe.form_dict.like = False - - disliked = like() + disliked = like("Blog Post", test_blog.name, False) self.assertEqual(disliked, False) frappe.db.delete("Comment", {"comment_type": "Like", "reference_doctype": "Blog Post"}) diff --git a/frappe/website/doctype/web_form/test_web_form.py b/frappe/website/doctype/web_form/test_web_form.py index f86aa21735..2da24bc776 100644 --- a/frappe/website/doctype/web_form/test_web_form.py +++ b/frappe/website/doctype/web_form/test_web_form.py @@ -14,15 +14,9 @@ test_dependencies = ["Web Form"] class TestWebForm(FrappeTestCase): def setUp(self): frappe.conf.disable_website_cache = True - frappe.local.path = None def tearDown(self): frappe.conf.disable_website_cache = False - frappe.local.path = None - frappe.local.request_ip = None - frappe.form_dict.web_form = None - frappe.form_dict.data = None - frappe.form_dict.docname = None def test_accept(self): frappe.set_user("Administrator") @@ -34,10 +28,6 @@ class TestWebForm(FrappeTestCase): "starts_on": "2014-09-09", } - frappe.form_dict.web_form = "manage-events" - frappe.form_dict.data = json.dumps(doc) - frappe.local.request_ip = "127.0.0.1" - accept(web_form="manage-events", data=json.dumps(doc)) self.event_name = frappe.db.get_value("Event", {"subject": "_Test Event Web Form"}) @@ -58,11 +48,7 @@ class TestWebForm(FrappeTestCase): frappe.db.get_value("Event", self.event_name, "description"), doc.get("description") ) - frappe.form_dict.web_form = "manage-events" - frappe.form_dict.docname = self.event_name - frappe.form_dict.data = json.dumps(doc) - - accept(web_form="manage-events", docname=self.event_name, data=json.dumps(doc)) + accept("manage-events", json.dumps(doc)) self.assertEqual( frappe.db.get_value("Event", self.event_name, "description"), doc.get("description") From 7aed89ae4d41252964f0febc53f0e3eb1185e305 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sat, 5 Aug 2023 14:43:45 +0530 Subject: [PATCH 55/81] test: set request before verifying --- frappe/email/queue.py | 5 ----- frappe/tests/test_email.py | 8 +++++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index cae5f76b3d..b481fd21cd 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -88,11 +88,6 @@ def get_unsubcribed_url( if unsubscribe_params: params.update(unsubscribe_params) - query_string = get_signed_params(params) - - # for test - frappe.local.flags.signed_query_string = query_string - return get_url(unsubscribe_method + "?" + get_signed_params(params)) diff --git a/frappe/tests/test_email.py b/frappe/tests/test_email.py index 4cde7f9ace..6c6b0a86cf 100644 --- a/frappe/tests/test_email.py +++ b/frappe/tests/test_email.py @@ -156,7 +156,7 @@ class TestEmail(FrappeTestCase): frappe.conf.use_ssl = False def test_expose(self): - + from frappe.utils import set_request from frappe.utils.verified_command import verify_request frappe.sendmail( @@ -199,9 +199,11 @@ class TestEmail(FrappeTestCase): if content: eol = "\r\n" - frappe.local.flags.signed_query_string = re.search( + query_string = re.search( r"(?<=/api/method/frappe.email.queue.unsubscribe\?).*(?=" + eol + ")", content.decode() ).group(0) + + set_request(method="GET", query_string=query_string) self.assertTrue(verify_request()) break @@ -320,6 +322,6 @@ class TestVerifiedRequests(FrappeTestCase): for params in test_cases: signed_url = get_signed_params(params) - set_request(method="GET", path="?" + signed_url) + set_request(method="GET", query_string=signed_url) self.assertTrue(verify_request()) frappe.local.request = None From fd2efdb0e1a5a4c9338f8bb21b3ee8d5986b3822 Mon Sep 17 00:00:00 2001 From: Michelle Alva <50285544+michellealva@users.noreply.github.com> Date: Sat, 5 Aug 2023 20:15:55 +0530 Subject: [PATCH 56/81] chore: whitelisted typo (#21930) --- frappe/utils/safe_exec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index c0bfd3cbbb..be105b329d 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -247,7 +247,7 @@ def safe_enqueue(function, **kwargs): Accepts frappe.enqueue params like job_name, queue, timeout, etc. in addition to params to be passed to function - :param function: whitelised function or API Method set in Server Script + :param function: whitelisted function or API Method set in Server Script """ return enqueue("frappe.utils.safe_exec.call_whitelisted_function", function=function, **kwargs) From 2b96324c311d140b0a5285e1cab98f2d1106f7cd Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sat, 5 Aug 2023 17:02:55 +0000 Subject: [PATCH 57/81] fix: rate limit for all HTTP methods (#21929) --- frappe/core/doctype/user/user.py | 2 +- frappe/website/doctype/web_form/web_form.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index b1f8777777..3a4fa12e91 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -1010,7 +1010,7 @@ def sign_up(email: str, full_name: str, redirect_to: str) -> tuple[int, str]: @frappe.whitelist(allow_guest=True) -@rate_limit(limit=get_password_reset_limit, seconds=24 * 60 * 60, methods=["POST"]) +@rate_limit(limit=get_password_reset_limit, seconds=24 * 60 * 60) def reset_password(user: str) -> str: if user == "Administrator": return "not allowed" diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 619692cc1d..0a2be0c1b8 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -429,7 +429,7 @@ def get_web_form_module(doc): @frappe.whitelist(allow_guest=True) -@rate_limit(key="web_form", limit=5, seconds=60, methods=["POST"]) +@rate_limit(key="web_form", limit=5, seconds=60) def accept(web_form, data): """Save the web form""" data = frappe._dict(json.loads(data)) From 4fae798ad1798296531bb3d06c2bbfb5f6aa8096 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Sun, 6 Aug 2023 13:51:22 +0200 Subject: [PATCH 58/81] fix: check file permission before zipping (#21934) --- frappe/core/doctype/file/file.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index cc3c2c228e..d334eaad1e 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -734,6 +734,8 @@ class File(Document): continue if _file.is_folder: continue + if not has_permission(_file, "read"): + continue zf.writestr(_file.file_name, _file.get_content()) zf.close() return zip_file.getvalue() From 5fce1a57c0a55e68bebe67e6f766d11b9d25a111 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Sun, 6 Aug 2023 14:03:34 +0200 Subject: [PATCH 59/81] fix: validate fieldname in get_group_by_count (#21932) * fix: validate fieldname in get_group_by_count * test: call get_group_by_count with invalid field * test: is_default_field --- frappe/desk/listview.py | 4 ++++ frappe/model/__init__.py | 4 ++++ frappe/tests/test_listview.py | 9 +++++++++ frappe/tests/test_model_utils.py | 12 +++++++++++- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index a1db82810e..cc32e4ab06 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -2,6 +2,7 @@ # License: MIT. See LICENSE import frappe +from frappe.model import is_default_field from frappe.query_builder import Order from frappe.query_builder.functions import Count from frappe.query_builder.terms import SubQuery @@ -59,6 +60,9 @@ def get_group_by_count(doctype: str, current_filters: str, field: str) -> list[d .run(as_dict=True) ) + if not frappe.get_meta(doctype).has_field(field) and not is_default_field(field): + raise ValueError("Field does not belong to doctype") + return frappe.get_list( doctype, filters=current_filters, diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index ff6ad36c42..32e46c83c2 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -225,3 +225,7 @@ def get_permitted_fields( return meta_fields + permitted_fields + optional_meta_fields return [] + + +def is_default_field(fieldname: str) -> bool: + return fieldname in default_fields diff --git a/frappe/tests/test_listview.py b/frappe/tests/test_listview.py index df2299875e..f5d0b857ba 100644 --- a/frappe/tests/test_listview.py +++ b/frappe/tests/test_listview.py @@ -71,6 +71,15 @@ class TestListView(FrappeTestCase): } self.assertEqual(data["Administrator"], 1) + def test_get_group_by_invalid_field(self): + self.assertRaises( + ValueError, + get_group_by_count, + "Note", + '[["Note Seen By","user","=","Administrator"]]', + "invalid_field", + ) + def test_list_view_comment_count(self): frappe.form_dict.doctype = "DocType" frappe.form_dict.limit = "1" diff --git a/frappe/tests/test_model_utils.py b/frappe/tests/test_model_utils.py index 25523012e9..61828ef500 100644 --- a/frappe/tests/test_model_utils.py +++ b/frappe/tests/test_model_utils.py @@ -2,7 +2,7 @@ from contextlib import contextmanager from random import choice import frappe -from frappe.model import core_doctypes_list, get_permitted_fields +from frappe.model import core_doctypes_list, get_permitted_fields, is_default_field from frappe.model.utils import get_fetch_values from frappe.tests.utils import FrappeTestCase @@ -66,6 +66,16 @@ class TestModelUtils(FrappeTestCase): get_permitted_fields("Installed Application", parenttype="Installed Applications"), [] ) + def test_is_default_field(self): + self.assertTrue(is_default_field("doctype")) + self.assertTrue(is_default_field("name")) + self.assertTrue(is_default_field("owner")) + + self.assertFalse(is_default_field({})) + self.assertFalse(is_default_field("qwerty1234")) + self.assertFalse(is_default_field(True)) + self.assertFalse(is_default_field(42)) + @contextmanager def set_user(user: str): From a2b2998684ae4e941210b51469e9f795ebae7e2f Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Sun, 6 Aug 2023 18:55:16 +0530 Subject: [PATCH 60/81] fix(DX): Wrap print format errors (#21944) [skip ci] --- frappe/exceptions.py | 4 ++++ frappe/utils/error.py | 2 +- frappe/utils/pdf.py | 26 +++++++++++++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 8dbd778a7d..f4bcb661f1 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -252,6 +252,10 @@ class SessionBootFailed(ValidationError): http_status_code = 500 +class PrintFormatError(ValidationError): + pass + + class TooManyWritesError(Exception): pass diff --git a/frappe/utils/error.py b/frappe/utils/error.py index 47902176ea..a3d39bbe7d 100644 --- a/frappe/utils/error.py +++ b/frappe/utils/error.py @@ -157,5 +157,5 @@ def guess_exception_source(exception: str) -> str | None: app_name = matches.group("app_name") apps[app_name] += app_priority.get(app_name, 0) - if probably_source := apps.most_common(1): + if (probably_source := apps.most_common(1)) and probably_source[0][0] != "frappe": return f"{probably_source[0][0]} (app)" diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 721b061257..6751364edc 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE +import contextlib import io import os import re @@ -43,7 +44,30 @@ def pdf_header_html(soup, head, content, styles, html_id, css): def pdf_body_html(template, args, **kwargs): - return template.render(args, filters={"len": len}) + try: + return template.render(args, filters={"len": len}) + except Exception as e: + # Guess line number ? + frappe.throw( + _("Error in print format on line {0}: {1}").format( + _guess_template_error_line_number(template), e + ), + exc=frappe.PrintFormatError, + title=_("Print Format Error"), + ) + + +def _guess_template_error_line_number(template) -> int | None: + """Guess line on which exception occured from current traceback.""" + with contextlib.suppress(Exception): + import sys + import traceback + + _, _, tb = sys.exc_info() + + for frame in reversed(traceback.extract_tb(tb)): + if template.filename in frame.filename: + return frame.lineno def pdf_footer_html(soup, head, content, styles, html_id, css): From 27426f7ceb13c59779bb225438a0ce60fc296c10 Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Mon, 7 Aug 2023 00:34:08 +0530 Subject: [PATCH 61/81] chore: code cleanup --- frappe/www/update-password.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 2510aa4bd4..e42a7804b3 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -23,9 +23,9 @@ - - + + @@ -46,7 +46,7 @@ frappe.ready(function() { // URL args const key = frappe.utils.get_url_arg('key'); const pasword_expired = frappe.utils.get_url_arg('password_expired'); - // inputs and button elements + // inputs, paragraphs and button elements const old_password = $('#old_password'); const new_password = $('#new_password'); const confirm_password = $('#confirm_password'); @@ -54,7 +54,7 @@ frappe.ready(function() { const password_strength_indicator = $('.password-strength-indicator'); const password_strength_message =$('.password-strength-message'); const password_mismatch_message = $('.password-mismatch-message'); - // Span text + // Info text const password_not_same_as_old_password = "{{ _('New password cannot be same as old password') }}"; const password_mismatch = "{{ _('Passwords do not match') }}"; const password_strength_message_success = "{{ _('Success! You are good to go đź‘Ť') }}"; @@ -80,6 +80,7 @@ frappe.ready(function() { key: key || "", old_password: old_password.val(), new_password: new_password.val(), + confirm_password: confirm_password.val(), logout_all_sessions: 1 } if (!args.old_password && !args.key) { @@ -105,12 +106,11 @@ frappe.ready(function() { return; } - if (args.new_password !== confirm_password.val()) { + if (args.new_password !== args.confirm_password) { password_mismatch_message.text(password_mismatch) .removeClass('hidden text-muted').addClass('text-danger'); password_strength_message.addClass('hidden'); - return false; - + return; } frappe.call({ From dbc61cc1373907c15f1fd0b693b8ee3b08f6e681 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 7 Aug 2023 10:17:04 +0530 Subject: [PATCH 62/81] fix: workflow help closes https://github.com/frappe/frappe/issues/21923 --- frappe/public/js/frappe/form/workflow.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js index e2a7d2091c..e3532fddc8 100644 --- a/frappe/public/js/frappe/form/workflow.js +++ b/frappe/public/js/frappe/form/workflow.js @@ -36,8 +36,9 @@ frappe.ui.form.States = class FormStates { ).join(", ") || __("None: End of Workflow").bold(); const document_editable_by = frappe.workflow - .get_document_state(me.frm.doctype, state) - .allow_edit.bold(); + .get_document_state_roles(me.frm.doctype, state) + .map((role) => role.bold()) + .join(", "); $(d.body) .html( From 3f971f37c178aff2ad0186d1022092733bcad25b Mon Sep 17 00:00:00 2001 From: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:33:41 +0530 Subject: [PATCH 63/81] feat: Added Re-run in Console Button in Console Log Doctype (#21825) * feat: Added Reload in Console Button in Console Log Doctype * refactor: simpler doc mapping * fix: added type of script * fix: renamed button name * fix: new solution for Re-run in console * refactor: use set_route [skip ci] --------- Co-authored-by: Ritvik Sardana Co-authored-by: Ankush Menat --- frappe/desk/doctype/console_log/console_log.js | 9 +++++++-- frappe/desk/doctype/console_log/console_log.json | 12 ++++++++++-- frappe/desk/doctype/console_log/console_log.py | 1 + frappe/desk/doctype/system_console/system_console.js | 10 +++++++++- frappe/desk/doctype/system_console/system_console.py | 3 +-- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/frappe/desk/doctype/console_log/console_log.js b/frappe/desk/doctype/console_log/console_log.js index 9a980667ac..822fbb466e 100644 --- a/frappe/desk/doctype/console_log/console_log.js +++ b/frappe/desk/doctype/console_log/console_log.js @@ -2,6 +2,11 @@ // For license information, please see license.txt frappe.ui.form.on("Console Log", { - // refresh: function(frm) { - // } + refresh: function (frm) { + frm.add_custom_button(__("Re-Run in Console"), () => { + localStorage.setItem("system_console_code", frm.doc.script); + localStorage.setItem("system_console_type", frm.doc.type); + frappe.set_route("Form", "System Console"); + }); + }, }); diff --git a/frappe/desk/doctype/console_log/console_log.json b/frappe/desk/doctype/console_log/console_log.json index b8ccf8c9b5..7531d97991 100644 --- a/frappe/desk/doctype/console_log/console_log.json +++ b/frappe/desk/doctype/console_log/console_log.json @@ -6,7 +6,8 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "script" + "script", + "type" ], "fields": [ { @@ -15,11 +16,18 @@ "in_list_view": 1, "label": "Script", "read_only": 1 + }, + { + "fieldname": "type", + "fieldtype": "Data", + "hidden": 1, + "label": "Type", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2023-07-05 22:16:02.823955", + "modified": "2023-07-27 22:52:37.239039", "modified_by": "Administrator", "module": "Desk", "name": "Console Log", diff --git a/frappe/desk/doctype/console_log/console_log.py b/frappe/desk/doctype/console_log/console_log.py index 9e243ee19a..bed829c5b8 100644 --- a/frappe/desk/doctype/console_log/console_log.py +++ b/frappe/desk/doctype/console_log/console_log.py @@ -15,5 +15,6 @@ class ConsoleLog(Document): from frappe.types import DF script: DF.Code | None + type: DF.Data | None # end: auto-generated types pass diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js index dc73f33b67..bd993824ce 100644 --- a/frappe/desk/doctype/system_console/system_console.js +++ b/frappe/desk/doctype/system_console/system_console.js @@ -10,7 +10,15 @@ frappe.ui.form.on("System Console", { description: __("Execute Console script"), ignore_inputs: true, }); - frm.set_value("type", "Python"); + if ( + localStorage.getItem("system_console_code") && + localStorage.getItem("system_console_type") + ) { + frm.set_value("type", localStorage.getItem("system_console_type")); + frm.set_value("console", localStorage.getItem("system_console_code")); + localStorage.removeItem("system_console_code"); + localStorage.removeItem("system_console_type"); + } }, refresh: function (frm) { diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py index 540936581a..14576d3860 100644 --- a/frappe/desk/doctype/system_console/system_console.py +++ b/frappe/desk/doctype/system_console/system_console.py @@ -40,8 +40,7 @@ class SystemConsole(Document): frappe.db.commit() else: frappe.db.rollback() - - frappe.get_doc(dict(doctype="Console Log", script=self.console)).insert() + frappe.get_doc(dict(doctype="Console Log", script=self.console, type=self.type)).insert() frappe.db.commit() From e877d926ebd564e15b4abd8438500dbe917eb34e Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 7 Aug 2023 06:07:23 +0000 Subject: [PATCH 64/81] test: set `request_ip` when testing `reset_password` (#21937) * test: set `request_ip` when testing `reset_password` * test: increase rate limit temporarily while testing `reset_password` --- frappe/core/doctype/user/test_user.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index b4d69d23d5..9be996e8c8 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -367,6 +367,9 @@ class TestUser(FrappeTestCase): set_request(path="/random") frappe.local.cookie_manager = CookieManager() frappe.local.login_manager = LoginManager() + # used by rate limiter when calling reset_password + frappe.local.request_ip = "127.0.0.1" + frappe.db.set_single_value("System Settings", "password_reset_limit", 6) frappe.set_user("testpassword@example.com") test_user = frappe.get_doc("User", "testpassword@example.com") From b385fae2dc9caff4acb27cc366e58cf01342a3de Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 7 Aug 2023 13:49:52 +0530 Subject: [PATCH 65/81] test: use unique IP to prevent future conflict with other tests --- frappe/core/doctype/user/test_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 9be996e8c8..1ca0a56ec0 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -368,7 +368,7 @@ class TestUser(FrappeTestCase): frappe.local.cookie_manager = CookieManager() frappe.local.login_manager = LoginManager() # used by rate limiter when calling reset_password - frappe.local.request_ip = "127.0.0.1" + frappe.local.request_ip = "127.0.0.69" frappe.db.set_single_value("System Settings", "password_reset_limit", 6) frappe.set_user("testpassword@example.com") From f6326b6145be8ed1ea2f4b4cbe80fad4b0b82205 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 7 Aug 2023 14:00:34 +0530 Subject: [PATCH 66/81] fix: check before deleting prepared report (#21950) --- frappe/core/doctype/prepared_report/prepared_report.py | 6 +++--- frappe/model/document.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index ef8ccce9c1..067cd728b2 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -211,9 +211,9 @@ def expire_stalled_report(): def delete_prepared_reports(reports): reports = frappe.parse_json(reports) for report in reports: - frappe.delete_doc( - "Prepared Report", report["name"], ignore_permissions=True, delete_permanently=True - ) + prepared_report = frappe.get_doc("Prepared Report", report["name"]) + if prepared_report.has_permission(): + prepared_report.delete(ignore_permissions=True, delete_permanently=True) def create_json_gz_file(data, dt, dn): diff --git a/frappe/model/document.py b/frappe/model/document.py index 9768200164..cedbe9ad71 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1039,7 +1039,7 @@ class Document(BaseDocument): """Rename the document to `name`. This transforms the current object.""" return self._rename(name=name, merge=merge, force=force, validate_rename=validate_rename) - def delete(self, ignore_permissions=False, force=False): + def delete(self, ignore_permissions=False, force=False, *, delete_permanently=False): """Delete document.""" return frappe.delete_doc( self.doctype, @@ -1047,6 +1047,7 @@ class Document(BaseDocument): ignore_permissions=ignore_permissions, flags=self.flags, force=force, + delete_permanently=delete_permanently, ) def run_before_save_methods(self): From 49a9f53d24ee125b28ff75c3cd11acd7a8f4cfe2 Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Mon, 7 Aug 2023 20:23:53 +0530 Subject: [PATCH 67/81] feat: text editor and mentions for discussions (#21886) --- cypress/integration/discussions.js | 40 ++--- frappe/public/js/frappe-web.bundle.js | 1 + .../js/frappe/form/controls/text_editor.js | 8 +- frappe/templates/discussions/button.html | 2 +- frappe/templates/discussions/comment_box.html | 7 +- frappe/templates/discussions/discussions.js | 150 ++++++++++++------ .../discussions/discussions_section.html | 7 +- frappe/templates/discussions/reply_card.html | 27 +++- .../templates/discussions/reply_section.html | 14 +- frappe/templates/discussions/sidebar.html | 2 +- frappe/templates/styles/discussion_style.css | 98 +++++++----- .../discussion_reply/discussion_reply.json | 5 +- .../discussion_reply/discussion_reply.py | 2 +- 13 files changed, 219 insertions(+), 144 deletions(-) diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js index 55bcabce19..9caeddeb1f 100644 --- a/cypress/integration/discussions.js +++ b/cypress/integration/discussions.js @@ -24,9 +24,9 @@ context("Discussions", () => { .should("have.value", "Discussion from tests"); // Enter comment - cy.get(".modal .comment-field") - .type("This is a discussion from the cypress ui tests.") - .should("have.value", "This is a discussion from the cypress ui tests."); + cy.get(".modal .discussions-comment").type( + "This is a discussion from the cypress ui tests." + ); // Submit cy.get(".modal .submit-discussion").click(); @@ -38,21 +38,16 @@ context("Discussions", () => { "Discussion from tests" ); cy.get(".discussion-on-page:visible").should("have.class", "show"); - cy.get(".discussion-on-page:visible .reply-card .reply-text").should( + cy.get(".discussion-on-page:visible .reply-card .reply-text .ql-editor p").should( "have.text", - "This is a discussion from the cypress ui tests.\n" + "This is a discussion from the cypress ui tests." ); }; const reply_through_comment_box = () => { - cy.get(".discussion-form:visible .comment-field") - .type( - "This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page." - ) - .should( - "have.value", - "This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page." - ); + cy.get(".discussion-form:visible .discussions-comment").type( + "This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page." + ); cy.get(".discussion-form:visible .submit-discussion").click(); cy.wait(3000); @@ -63,28 +58,18 @@ context("Discussions", () => { .find(".reply-text") .should( "have.text", - "This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page.\n" + "This is a discussion from the cypress ui tests. This comment was entered through the commentbox on the page.\n" ); }; - const cancel_and_clear_comment_box = () => { - cy.get(".discussion-form:visible .comment-field") - .type("This is a discussion from the cypress ui tests.") - .should("have.value", "This is a discussion from the cypress ui tests."); - - cy.get(".discussion-form:visible .cancel-comment").click(); - cy.get(".discussion-form:visible .comment-field").should("have.value", ""); - }; - const single_thread_discussion = () => { cy.visit("/test-single-thread"); cy.get(".discussions-sidebar").should("have.length", 0); cy.get(".reply").should("have.length", 0); - cy.get(".discussion-form:visible .comment-field") - .type("This comment is being made on a single thread discussion.") - .should("have.value", "This comment is being made on a single thread discussion."); - + cy.get(".discussion-form:visible .discussions-comment").type( + "This comment is being made on a single thread discussion." + ); cy.get(".discussion-form:visible .submit-discussion").click(); cy.wait(3000); cy.get(".discussion-on-page") @@ -96,6 +81,5 @@ context("Discussions", () => { it("reply through modal", reply_through_modal); it("reply through comment box", reply_through_comment_box); - it("cancel and clear comment box", cancel_and_clear_comment_box); it("single thread discussion", single_thread_discussion); }); diff --git a/frappe/public/js/frappe-web.bundle.js b/frappe/public/js/frappe-web.bundle.js index 36064767fb..30cf552c82 100644 --- a/frappe/public/js/frappe-web.bundle.js +++ b/frappe/public/js/frappe-web.bundle.js @@ -24,3 +24,4 @@ import "./bootstrap-4-web.bundle"; import "../../website/js/website.js"; import "./frappe/socketio_client.js"; +import "./frappe/form/controls/control.js"; diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index fd0e878567..15e11cd9e4 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -198,14 +198,18 @@ frappe.ui.form.ControlTextEditor = class ControlTextEditor extends frappe.ui.for get_quill_options() { return { modules: { - toolbar: this.get_toolbar_options(), + toolbar: Object.keys(this.df).includes("get_toolbar_options") + ? this.df.get_toolbar_options() + : this.get_toolbar_options(), table: true, imageResize: {}, magicUrl: true, mention: this.get_mention_options(), }, - theme: "snow", + theme: this.df.theme || "snow", readOnly: this.disabled, + bounds: this.quill_container[0], + placeholder: this.df.placeholder || "", }; } diff --git a/frappe/templates/discussions/button.html b/frappe/templates/discussions/button.html index 746227aa0b..dfc206b0b9 100644 --- a/frappe/templates/discussions/button.html +++ b/frappe/templates/discussions/button.html @@ -1,6 +1,6 @@ {% if frappe.session.user != "Guest" and (condition is not defined or (condition is defined and condition )) %} - + {{ _(cta_title) }} {% endif %} diff --git a/frappe/templates/discussions/comment_box.html b/frappe/templates/discussions/comment_box.html index 23c1bbecf1..eb27f6623a 100644 --- a/frappe/templates/discussions/comment_box.html +++ b/frappe/templates/discussions/comment_box.html @@ -15,19 +15,16 @@
- +
- {{ _("Press Cmd+Enter to post your comment") }} + {{ _("Cmd+Enter to add comment") }}
- {{ _("Cancel") }}
{{ _("Post") }}
diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index 56ab3e1ed2..4b296fbcce 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -1,8 +1,12 @@ frappe.ready(() => { setup_socket_io(); - add_color_to_avatars(); + this.single_thread = $(".is-single-thread").length; + if (this.single_thread) { + make_comment_editor($(".discussion-form .discussions-comment")); + } + $(".search-field").keyup((e) => { search_topic(e); }); @@ -15,13 +19,21 @@ frappe.ready(() => { login_from_discussion(e); }); - $(".sidebar-parent").click((e) => { + $("#discussion-modal .close").click((e) => { + $("#discussion-modal .discussions-comment").html(""); + }); + + $(document).on("click", ".sidebar-parent", (e) => { if ($(e.currentTarget).attr("aria-expanded") == "true") { e.stopPropagation(); } + setTimeout(() => { + let element = $(".discussion-form:visible .discussions-comment"); + if (!element.find(".ql-editor").length) make_comment_editor(element); + }, 0); }); - $(document).on("keydown", ".comment-field", (e) => { + $(document).on("keydown", ".discussions-comment", (e) => { if ( (e.ctrlKey || e.metaKey) && (e.keyCode == 13 || e.which == 13) && @@ -36,10 +48,6 @@ frappe.ready(() => { submit_discussion(e); }); - $(document).on("click", ".cancel-comment", () => { - clear_comment_box(); - }); - $(document).on("click", ".sidebar-parent", () => { hide_sidebar(); }); @@ -55,59 +63,69 @@ frappe.ready(() => { $(document).on("click", ".reply-card .dropdown-menu", (e) => { perform_action(e); }); - - $(document).on("input", ".discussion-on-page .comment-field", (e) => { - adjust_comment_box(e); - }); }); const show_new_topic_modal = (e) => { e.preventDefault(); $("#discussion-modal").modal("show"); + make_comment_editor($("#discussion-modal .discussions-comment")); let topic = $(e.currentTarget).attr("data-topic"); $("#submit-discussion").attr("data-topic", topic ? topic : ""); }; const setup_socket_io = () => { frappe.realtime.init(window.socketio_port || "9000"); + frappe.realtime.on("publish_message", (data) => { publish_message(data); }); + frappe.realtime.on("update_message", (data) => { update_message(data); }); + frappe.realtime.socket.on("delete_message", (data) => { delete_message(data); }); }; const publish_message = (data) => { - const doctype = decodeURIComponent($(".discussions-parent").attr("data-doctype")); - const docname = decodeURIComponent($(".discussions-parent").attr("data-docname")); - const topic = data.topic_info; - const single_thread = $(".is-single-thread").length; - const first_topic = !$(".reply-card").length; - const document_match_found = - doctype == topic.reference_doctype && docname == topic.reference_docname; - post_message_cleanup(); + data = enhance_template(data); + insert_message(data); +}; + +const enhance_template = (data) => { data.template = hide_actions_on_conditions(data.template, data.reply_owner); data.template = style_avatar_frame(data.template); data.sidebar = style_avatar_frame(data.sidebar); data.new_topic_template = style_avatar_frame(data.new_topic_template); + return data; +}; + +const insert_message = (data) => { + const topic = data.topic_info; + const first_topic = !$(".reply-card").length; + const doctype = decodeURIComponent($(".discussions-parent").attr("data-doctype")); + const docname = decodeURIComponent($(".discussions-parent").attr("data-docname")); + const document_match_found = + doctype == topic.reference_doctype && docname == topic.reference_docname; if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { $(data.template).insertBefore( `.discussion-on-page[data-topic=${topic.name}] .discussion-form` ); - } else if (!first_topic && !single_thread && document_match_found) { + } else if (!first_topic && !this.single_thread && document_match_found) { $(data.sidebar).insertBefore($(`.discussions-sidebar .sidebar-parent`).first()); $(`#discussion-group`).prepend(data.new_topic_template); if (topic.owner == frappe.session.user) { $(".discussion-on-page") && $(".discussion-on-page").collapse(); $(".sidebar-parent").first().click(); + setTimeout(() => { + make_comment_editor($(".discussion-form:visible .discussions-comment")); + }, 1000); } - } else if (single_thread && document_match_found) { + } else if (this.single_thread && document_match_found) { $(data.template).insertBefore(`.discussion-form`); $(".discussion-on-page").attr("data-topic", topic.name); } else if (topic.owner == frappe.session.user && document_match_found) { @@ -122,15 +140,18 @@ const update_message = (data) => { reply_card.find(".reply-body").removeClass("hide"); reply_card.find(".reply-edit-card").addClass("hide"); reply_card.find(".reply-text").html(data.reply); + reply_card.find(".comment-content").html(data.reply); reply_card.find(".reply-actions").addClass("hide"); + reply_card.find(".dropdown").removeClass("hide"); + reply_card.find(".discussions-comment").html(""); }; const post_message_cleanup = () => { $(".topic-title").val(""); - $(".discussion-form .comment-field").val(""); + $("#discussion-modal .discussions-comment").html(""); $("#discussion-modal").modal("hide"); $("#no-discussions").addClass("hide"); - $(".cancel-comment").addClass("hide"); + this.comment_editor && this.comment_editor.set_value("comment_editor", ""); }; const update_reply_count = (topic) => { @@ -193,10 +214,9 @@ const submit_discussion = (e) => { const target = $(e.currentTarget); const reply_name = target.closest(".reply-card").data("reply"); const title = $(".topic-title:visible").length ? $(".topic-title:visible").val().trim() : ""; - let reply = reply_name ? target.closest(".reply-card") : target.closest(".discussion-form"); - reply = reply.find(".comment-field").val().trim(); + let reply = this.comment_editor.get_value("comment_editor"); - if (reply) { + if (strip_html(reply).trim() != "" || reply.includes("img")) { let doctype = target.closest(".discussions-parent").attr("data-doctype"); doctype = doctype ? decodeURIComponent(doctype) : doctype; @@ -246,11 +266,6 @@ const style_avatar_frame = (template) => { return $template.prop("outerHTML"); }; -const clear_comment_box = () => { - $(".discussion-form .comment-field").val(""); - $(".cancel-comment").removeClass("show").addClass("hide"); -}; - const hide_sidebar = () => { $(".discussions-sidebar").addClass("hide"); $("#discussion-group").removeClass("hide"); @@ -268,43 +283,78 @@ const back_to_sidebar = () => { const perform_action = (e) => { const action = $(e.target).data().action; - const reply_card = $(e.target).closest(".reply-card"); if (action === "edit") { - reply_card.find(".reply-edit-card").removeClass("hide"); - reply_card.find(".reply-body").addClass("hide"); - reply_card.find(".reply-actions").removeClass("hide"); + edit_reply(e); } else if (action === "delete") { - frappe.call({ - method: "frappe.website.doctype.discussion_reply.discussion_reply.delete_message", - args: { - reply_name: $(e.target).closest(".reply-card").data("reply"), - }, - }); + delete_reply(e); } }; +const edit_reply = (e) => { + const reply_card = $(e.target).closest(".reply-card"); + reply_card.find(".reply-edit-card").removeClass("hide"); + reply_card.find(".reply-body").addClass("hide "); + reply_card.find(".reply-actions").removeClass("hide"); + reply_card.find(".dropdown").addClass("hide"); + make_comment_editor(reply_card.find(".discussions-comment")); +}; + +const delete_reply = (e) => { + frappe.call({ + method: "frappe.website.doctype.discussion_reply.discussion_reply.delete_message", + args: { + reply_name: $(e.target).closest(".reply-card").data("reply"), + }, + }); +}; + const dismiss_reply = (e) => { const reply_card = $(e.currentTarget).closest(".reply-card"); reply_card.find(".reply-edit-card").addClass("hide"); reply_card.find(".reply-body").removeClass("hide"); reply_card.find(".reply-actions").addClass("hide"); -}; - -const adjust_comment_box = (e) => { - if ($(e.currentTarget).val()) { - $(".cancel-comment").removeClass("hide").addClass("show"); - } else { - $(".cancel-comment").removeClass("show").addClass("hide"); - } + reply_card.find(".dropdown").removeClass("hide"); + reply_card.find(".discussions-comment").html(""); }; const hide_actions_on_conditions = (template, owner) => { let $template = $(template); - frappe.session.user != owner && $template.find(".dropdown").addClass("hide"); + frappe.session.user != owner && $template.find(".dropdown").remove(); return $template.prop("outerHTML"); }; const delete_message = (data) => { $(`[data-reply=${data.reply_name}]`).addClass("hide"); }; + +const make_comment_editor = (element) => { + this.comment_editor = new frappe.ui.FieldGroup({ + fields: [ + { + fieldname: "comment_editor", + fieldtype: "Text Editor", + enable_mentions: true, + theme: "bubble", + placeholder: __("Type your reply here..."), + default: element.siblings(".comment-content").html(), + get_toolbar_options() { + return [ + ["bold", "italic", "underline", "strike"], + ["blockquote", "code-block"], + [{ direction: "rtl" }], + ["link", "image"], + [{ list: "ordered" }, { list: "bullet" }], + [{ align: [] }], + ["clean"], + ]; + }, + }, + ], + body: element, + }); + this.comment_editor.make(); + element.find(".form-section:last").removeClass("empty-section"); + element.find(".frappe-control").removeClass("hide-control"); + element.find(".form-column").addClass("p-0"); +}; diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index 5db7cf86b1..d38b7c929a 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -5,13 +5,16 @@
+ {% if not single_thread %} {% include "frappe/templates/discussions/topic_modal.html" %} + {% endif %}
- {{ _(title) }} + {{ _(title) }} {% if topics | length and not single_thread %} {% include "frappe/templates/discussions/search.html" %} {% endif %} + {% if topics and not single_thread %} {% include "frappe/templates/discussions/button.html" %} {% endif %} @@ -20,7 +23,7 @@
{% if topics and not single_thread %} -
+
{% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name})%} diff --git a/frappe/templates/discussions/reply_card.html b/frappe/templates/discussions/reply_card.html index e334f5b2ed..86a9f4be26 100644 --- a/frappe/templates/discussions/reply_card.html +++ b/frappe/templates/discussions/reply_card.html @@ -4,11 +4,13 @@
{{ avatar(reply.owner) }} - {{ member.full_name }} -
{{ frappe.utils.pretty_date(reply.creation) }}
+
+ {{ frappe.utils.pretty_date(reply.creation) }} +
{{ _("Post") }}
{{ _("Dismiss") }}
@@ -17,31 +19,40 @@
{% if frappe.session.user == reply.owner %} -
+
{% endif %} -
{{ frappe.utils.md_to_html(reply.reply) }}
+
+ +
+
{{ reply.reply }}
- +
+
+ {{ reply.reply }} +
diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index 6d219030d7..803a178b1b 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -1,26 +1,28 @@ {% if topic %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name}, -["reply", "owner", "creation", "name"], order_by="creation")%} + ["reply", "owner", "creation", "name"], order_by="creation")%} {% endif %} -
+ {% if not single_thread %}
- {% if not single_thread %}
- +
- {% endif %} {% if topic and topic.title %} -
{{ topic.title }}
+
+ {{ topic.title }} +
{% endif %}
+ {% endif %} {% for reply in replies %} {% set index = loop.index %} diff --git a/frappe/templates/discussions/sidebar.html b/frappe/templates/discussions/sidebar.html index 05125f2bc3..03915db331 100644 --- a/frappe/templates/discussions/sidebar.html +++ b/frappe/templates/discussions/sidebar.html @@ -8,7 +8,7 @@
{{ topic.title }}
- +
{{ creator.full_name }}
diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 2b244d9a15..2c1c120fcb 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -1,28 +1,8 @@ -.modal .comment-field { - height: 300px; - resize: none; -} - -.discussion-on-page .comment-field { - padding: 1rem; -} - -.modal .cancel-comment { - display: none; -} - .modal .comment-footer div:first-child { display: none; } -.cancel-comment { - font-size: var(--text-sm); - margin-right: 0.5rem; - cursor: pointer; -} - .discussions-header { - margin: 2.5rem 0 1.25rem; display: flex; align-items: center; } @@ -42,9 +22,9 @@ background-image: url(/assets/frappe/icons/timeless/search.svg); background-repeat: no-repeat; text-indent: 1.5rem; - background-position: 1rem 0.65rem; + background-position: 1rem 0.45rem; font-size: var(--text-md); - padding: 0.5rem 1rem; + padding: 0.3rem 1rem; border: 1px solid var(--dark-border-color); border-radius: var(--border-radius-md); margin-right: 0.5rem; @@ -68,7 +48,13 @@ } .reply-card { - margin-bottom: 1.5rem; + padding: 1.25rem 0; + border-bottom: 1px solid var(--gray-200); +} + +.reply-card:last-of-type { + border-bottom: none; + padding-bottom: 0; } .reply-card .dropdown { @@ -79,7 +65,6 @@ color: var(--text-color); font-size: var(--text-lg); font-weight: 600; - margin-bottom: 0.5rem; } .discussion-on-page .topic-title { @@ -88,21 +73,12 @@ .discussion-on-page { flex-direction: column; - padding: 1.5rem; } .submit-discussion { cursor: pointer; } -.reply-body { - background: var(--bg-color); - padding: 1rem; - border-radius: var(--border-radius); - font-size: var(--text-md); - color: var(--text-color); -} - .reply-actions { display: flex; align-items: center; @@ -137,9 +113,16 @@ align-items: center; } +.discussions-section-title { + font-size: var(--text-2xl); + font-weight: 600; + color: var(--text-color); + flex-grow: 1; +} + .discussion-heading { font-weight: 600; - font-size: var(--text-3xl); + font-size: var(--text-lg); line-height: 146%; letter-spacing: -0.0175em; color: var(--text-color); @@ -179,6 +162,7 @@ } .back-button { + display: flex; margin-right: 1rem; cursor: pointer; } @@ -197,7 +181,7 @@ } .empty-state { - background: var(--control-bg); + border: 1px solid var(--gray-300); border-radius: var(--border-radius-lg); padding: 2rem; display: flex; @@ -219,7 +203,7 @@ .sidebar-parent { display: flex; align-items: center; - padding: 1.25rem; + padding: 1.25rem 0; cursor: pointer; } @@ -243,7 +227,7 @@ .reply-section-header { display: flex; align-items: center; - margin-bottom: 2.5rem; + margin-top: 1.5rem; } .reply-header { @@ -265,6 +249,44 @@ margin-bottom: 0; } -.reply-body .dropdown-menu { +.reply-header .dropdown-menu { min-width: 7rem; } + +.discussions-parent .ql-editor { + border-radius: var(--border-radius-md); +} + +.mention { + display: inline-block; + height: auto; + width: auto; + border-radius: var(--border-radius-lg); + border: 1px solid var(--border-color); + padding: 2px 5px; + font-size: var(--text-sm); + background-color: var(--fg-color); +} + +.mention a { + text-decoration: none; + color: inherit; +} + +.ql-editor.read-mode .mention { + background-color: var(--control-bg); +} + +.ql-editor.read-mode .mention a { + color: inherit; + background-color: inherit; +} + +.discussion-form .form-group { + margin-bottom: 0; +} + +.discussions-parent .ql-editor.ql-blank::before { + color: var(--gray-600); + font-style: normal; +} \ No newline at end of file diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.json b/frappe/website/doctype/discussion_reply/discussion_reply.json index 7dda2b659e..4d96bcb813 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.json +++ b/frappe/website/doctype/discussion_reply/discussion_reply.json @@ -12,7 +12,7 @@ "fields": [ { "fieldname": "reply", - "fieldtype": "Long Text", + "fieldtype": "Text Editor", "in_list_view": 1, "label": "Reply" }, @@ -27,7 +27,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-09-28 12:09:10.875927", + "modified": "2021-09-28 12:09:10.875929", "modified_by": "Administrator", "module": "Website", "name": "Discussion Reply", @@ -49,5 +49,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.py b/frappe/website/doctype/discussion_reply/discussion_reply.py index b4d1e22695..3bc1bb17e9 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.py +++ b/frappe/website/doctype/discussion_reply/discussion_reply.py @@ -15,7 +15,7 @@ class DiscussionReply(Document): if TYPE_CHECKING: from frappe.types import DF - reply: DF.LongText | None + reply: DF.TextEditor | None topic: DF.Link | None # end: auto-generated types def on_update(self): From 6ed6a3f7628c2d77085e7e45e1f9c379fb1a8ecf Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 7 Aug 2023 20:47:58 +0530 Subject: [PATCH 68/81] chore: minor fix --- frappe/www/update-password.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index e42a7804b3..2e6c3cf089 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -45,7 +45,7 @@ frappe.ready(function() { // URL args const key = frappe.utils.get_url_arg('key'); - const pasword_expired = frappe.utils.get_url_arg('password_expired'); + const password_expired = frappe.utils.get_url_arg('password_expired'); // inputs, paragraphs and button elements const old_password = $('#old_password'); const new_password = $('#new_password'); @@ -63,7 +63,7 @@ frappe.ready(function() { old_password.parent().toggle(); } - if(pasword_expired) { + if(password_expired) { $(".password-box").html("{{ _('The password of your account has expired.') }}"); } @@ -193,8 +193,8 @@ frappe.ready(function() { password_strength_message.addClass("hidden"); } if ((key || (!key && old_password.val() && password_mismatch_message.text() !== password_not_same_as_old_password )) && common_conditions ) { - update_button.prop("disabled", false).css("cursor", "pointer"); - } + update_button.prop("disabled", false).css("cursor", "pointer"); + } else { update_button.prop("disabled", true).css("cursor", "not-allowed"); } From f6171008f6eba6e5d76456768c0f0fd00af2a570 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Mon, 7 Aug 2023 22:18:39 -0600 Subject: [PATCH 69/81] chore: Translate repeat frecuency on sidebar (#21956) [skip ci] --- frappe/public/js/frappe/form/sidebar/form_sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 4859fa5c02..430ff487e7 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -130,7 +130,7 @@ frappe.ui.form.Sidebar = class { callback: function (res) { me.sidebar .find(".auto-repeat-status") - .html(__("Repeats {0}", [res.message.frequency])); + .html(__("Repeats {0}", [__(res.message.frequency)])); me.sidebar.find(".auto-repeat-status").on("click", function () { frappe.set_route("Form", "Auto Repeat", me.frm.doc.auto_repeat); }); From c3aaab3447281750e270416ab6c8d6eaa3d79944 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 8 Aug 2023 07:35:42 +0200 Subject: [PATCH 70/81] fix(Web Form): translation of forwarding message (#21948) --- frappe/translations/de.csv | 3 +++ frappe/translations/es.csv | 3 +++ frappe/translations/fr.csv | 3 +++ frappe/translations/it.csv | 3 +++ frappe/website/doctype/web_form/templates/web_form.html | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index f8bbd8e22e..1c209db604 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -3041,6 +3041,7 @@ zoom-out,verkleinern, {0} Calendar,{0} Kalender, {0} Chart,{0} Diagramm, {0} Dashboard,{0}-Dashboard, +{0} if you are not redirected within 5 seconds,"{0}, falls Sie nicht innerhalb von 5 Sekunden weitergeleitet werden", {0} List,{0} Liste, {0} Modules,{0} Module, {0} Report,{0} Bericht(e), @@ -3240,6 +3241,7 @@ Check the Error Log for more information: {0},Überprüfen Sie das Fehlerprotoko Clear Cache and Reload,Cache leeren und neu laden, Clear Filters,Filter löschen, Clear all filters,Alle Filter löschen, +Click here,Klicken Sie hier, Click on Authorize Google Drive Access to authorize Google Drive Access.,"Klicken Sie auf Google Drive Access autorisieren, um Google Drive Access zu autorisieren.", Click on a file to select it.,"Klicken Sie auf eine Datei, um sie auszuwählen.", Click on the link below to approve the request,"Klicken Sie auf den folgenden Link, um die Anfrage zu genehmigen", @@ -4637,6 +4639,7 @@ Published on,Veröffentlicht auf, Enable developer mode to create a standard Web Template,"Aktivieren Sie den Entwicklermodus, um eine Standard-Webvorlage zu erstellen", Was this article helpful?,War dieser Artikel hilfreich?, Thank you for your feedback!,Vielen Dank für dein Feedback!, +Thank you for spending your valuable time to fill this form,"Vielen Dank, dass Sie sich die Zeit genommen haben, dieses Formular auszufüllen", New Mention on {0},Neue Erwähnung zu {0}, Assignment Update on {0},Zuweisungsaktualisierung auf {0}, New Document Shared {0},Neues Dokument freigegeben {0}, diff --git a/frappe/translations/es.csv b/frappe/translations/es.csv index a01e456f3e..b0b1dc33ef 100644 --- a/frappe/translations/es.csv +++ b/frappe/translations/es.csv @@ -680,6 +680,7 @@ Clear Error Logs,Limpiar Registros de Errores, Clear User Permissions,Borrar permisos de usuario, Clear all roles,Limpiar todos los roles, "Clearing end date, as it cannot be in the past for published pages.","Borrando la fecha de finalización, ya que no puede ser en el pasado para las páginas publicadas.", +Click here,Click aquí, Click here to post bugs and suggestions,Haga clic aquí para publicar errores y sugerencias, Click here to verify,Haga clic aquí para verificar, Click on the link below to complete your registration and set a new password,Haga clic en el enlace de abajo para completar su registro y establecer una nueva contraseña, @@ -2460,6 +2461,7 @@ Text Color,Color de texto, Text Content,Contenido del texto, Text Editor,Editor de texto, Text to be displayed for Link to Web Page if this form has a web page. Link route will be automatically generated based on `page_name` and `parent_website_route`,"El texto que se mostrará para enlazar a la página web, en caso que este formulario sea una pagina web. El enlace se generará automaticamente basado en 'nombre de pagina' y ruta del sitio principal' (`page_name` and `parent_website_route`)", +Thank you for spending your valuable time to fill this form,Gracias por tomarse el tiempo para llenar este formulario, Thank you for your email,Gracias por su Email, Thank you for your interest in subscribing to our updates,Gracias por su interés en suscribirse a nuestras actualizaciones, Thank you for your message,¡Gracias por tu mensaje!, @@ -3027,6 +3029,7 @@ zoom-out,Alejar, {0} Calendar,{0} Calendario, {0} Chart,{0} Gráfico, {0} Dashboard,{0} Panel de control, +{0} if you are not redirected within 5 seconds,{0} si no es redirigido en 5 segundos, {0} List,Lista {0}, {0} Modules,{0} Módulos, {0} Report,{0} Informe, diff --git a/frappe/translations/fr.csv b/frappe/translations/fr.csv index 2983a9c1b5..97eae9db8f 100644 --- a/frappe/translations/fr.csv +++ b/frappe/translations/fr.csv @@ -3014,6 +3014,7 @@ zoom-out,Réduire, {0} Calendar,{0} Calendrier, {0} Chart,Graphique {0}, {0} Dashboard,{0} Tableau de bord, +{0} if you are not redirected within 5 seconds,{0} si vous n'êtes pas redirigé dans les 5 secondes, {0} List,Liste {0}, {0} Modules,{0} Modules, {0} Report,Rapport {0}, @@ -3212,6 +3213,7 @@ Change User,Changer d'utilisateur, Check the Error Log for more information: {0},Consultez le journal des erreurs pour plus d'informations: {0}, Clear Cache and Reload,Vider le cache et recharger, Clear Filters,Effacer les filtres, +Click here,Cliquez ici, Click on Authorize Google Drive Access to authorize Google Drive Access.,Cliquez sur Autoriser l'accès à Google Drive pour autoriser l' accès à Google Drive., Click on a file to select it.,Cliquez sur un fichier pour le sélectionner., Click on the link below to approve the request,Cliquez sur le lien ci-dessous pour approuver la demande., @@ -4605,6 +4607,7 @@ Published on,Publié le, Enable developer mode to create a standard Web Template,Activer le mode développeur pour créer un modèle Web standard, Was this article helpful?,Cet article a-t-il été utile?, Thank you for your feedback!,Merci pour votre avis!, +Thank you for spending your valuable time to fill this form,"Merci d'avoir consacré votre temps précieux à remplir ce formulaire", New Mention on {0},Nouvelle mention sur {0}, Assignment Update on {0},Mise à jour du devoir le {0}, New Document Shared {0},Nouveau document partagé {0}, diff --git a/frappe/translations/it.csv b/frappe/translations/it.csv index 75bb160774..730db99df8 100644 --- a/frappe/translations/it.csv +++ b/frappe/translations/it.csv @@ -666,6 +666,7 @@ Clear Error Logs,Registri evidente errore, Clear User Permissions,Cancella autorizzazioni utente, Clear all roles,Cancellare tutti i ruoli, "Clearing end date, as it cannot be in the past for published pages.","Cancellare la data di fine, in quanto non può essere nel passato per le pagine pubblicate.", +Click here,Clicca qui, Click here to post bugs and suggestions,Clicca qui per inserire bug e suggerimenti, Click here to verify,Clicca qui per verificare, Click on the link below to complete your registration and set a new password,Clicca sul link qui sotto per completare la registrazione e impostare una nuova password, @@ -3012,6 +3013,7 @@ zoom-out,Riduci, {0} Calendar,{0} Calendario, {0} Chart,{0} Grafico, {0} Dashboard,{0} Dashboard, +{0} if you are not redirected within 5 seconds,{0} se non vieni reindirizzato entro 5 secondi, {0} List,{0} Lista, {0} Modules,{0} Moduli, {0} Report,{0} Report, @@ -4604,6 +4606,7 @@ Published on,pubblicato su, Enable developer mode to create a standard Web Template,Abilita la modalità sviluppatore per creare un modello web standard, Was this article helpful?,questo articolo è stato utile?, Thank you for your feedback!,Grazie per il tuo feedback!, +Thank you for spending your valuable time to fill this form,Grazie per aver dedicato il tuo prezioso tempo a compilare questo modulo, New Mention on {0},Nuova menzione su {0}, Assignment Update on {0},Aggiornamento del compito su {0}, New Document Shared {0},Nuovo documento condiviso {0}, diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index 6bda7f8e49..48ffca1698 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -141,8 +141,8 @@ {% if success_url %}

- {% set success_link = "link".format(success_url) %} - {{ _("Click on this {0} if you are not redirected within 5 seconds").format(success_link) }} + {% set success_link = '{1}'.format(success_url, _("Click here")) %} + {{ _("{0} if you are not redirected within 5 seconds").format(success_link) }}

{% else %} From 59e1db7bb58e155744f9a2e7912fd233f9fac981 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 8 Aug 2023 12:57:44 +0530 Subject: [PATCH 71/81] fix: barcode scanner library path --- frappe/public/js/frappe/scanner/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/scanner/index.js b/frappe/public/js/frappe/scanner/index.js index 6e641677fd..067e073094 100644 --- a/frappe/public/js/frappe/scanner/index.js +++ b/frappe/public/js/frappe/scanner/index.js @@ -94,6 +94,6 @@ frappe.ui.Scanner = class Scanner { } load_lib() { - return frappe.require("/assets/frappe/node_modules/html5-qrcode/dist/html5-qrcode.min.js"); + return frappe.require("/assets/frappe/node_modules/html5-qrcode/html5-qrcode.min.js"); } }; From b10a049adac6993d063f5c3a79fb56887bb9c41d Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Tue, 8 Aug 2023 13:56:06 +0530 Subject: [PATCH 72/81] fix: update time_series on refresh, but not for custom chart_type --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 5ed71e91a8..5d16a6d6d1 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -48,6 +48,7 @@ frappe.ui.form.on("Dashboard Chart", { frm.set_df_property("dynamic_filters_section", "hidden", 1); frm.trigger("set_parent_document_type"); + frm.trigger("set_time_series"); frm.set_query("document_type", function () { return { filters: { @@ -106,6 +107,8 @@ frappe.ui.form.on("Dashboard Chart", { // set timeseries based on chart type if (["Count", "Average", "Sum"].includes(frm.doc.chart_type)) { frm.set_value("timeseries", 1); + } else if (frm.doc.chart_type == "Custom") { + return; } else { frm.set_value("timeseries", 0); } From 60d20b4d22d6b39f154f3f6932dc448f6d22c623 Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 8 Aug 2023 15:02:36 +0530 Subject: [PATCH 73/81] fix(ServerScript): use f-string in permission query help html --- frappe/core/doctype/server_script/server_script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js index ca5b8d721b..b3193de714 100644 --- a/frappe/core/doctype/server_script/server_script.js +++ b/frappe/core/doctype/server_script/server_script.js @@ -68,7 +68,7 @@ else: 

 # generate dynamic conditions and set it in the conditions variable
 tenant_id = frappe.db.get_value(...)
-conditions = 'tenant_id = {}'.format(tenant_id)
+conditions = f'tenant_id = {tenant_id}'
 
 # resulting select query
 select name from \`tabPerson\`

From 395511f18d583e9af1da3cd19818ca687069237c Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine 
Date: Wed, 9 Aug 2023 01:06:47 +0900
Subject: [PATCH 74/81] chore: fix typo in README.md

installlation -> installation
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3b76648a2..aefa0db1d2 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Full-stack web application framework that uses Python and MariaDB on the server
 
 ### Development
 * [Easy install script using Docker images](https://github.com/frappe/bench/tree/develop#easy-install-script)
-* [Development installlation on bare metal](https://frappeframework.com/docs/user/en/installation)
+* [Development installation on bare metal](https://frappeframework.com/docs/user/en/installation)
 
 
 ## Contributing

From b4674ee0d119594a35e9fcbe54d1774330691b42 Mon Sep 17 00:00:00 2001
From: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
Date: Wed, 9 Aug 2023 13:29:45 +0530
Subject: [PATCH 75/81] Error during selection of Custom Html Block on
 workspace and during selection of Custom Html Block on DashBoard due to wrong
 syntext

---
 frappe/desk/doctype/custom_html_block/custom_html_block.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/custom_html_block/custom_html_block.py b/frappe/desk/doctype/custom_html_block/custom_html_block.py
index 3ce7966f6a..493b7ee4e4 100644
--- a/frappe/desk/doctype/custom_html_block/custom_html_block.py
+++ b/frappe/desk/doctype/custom_html_block/custom_html_block.py
@@ -30,7 +30,7 @@ def get_custom_blocks_for_user(doctype, txt, searchfield, start, page_len, filte
 	# return logged in users private blocks and all public blocks
 	customHTMLBlock = DocType("Custom HTML Block")
 
-	condition_query = frappe.qb.get_query(customHTMLBlock)
+	condition_query = frappe.qb.from_(customHTMLBlock)
 
 	return (
 		condition_query.select(customHTMLBlock.name).where(

From 4d19863dfa320388b12a84bb2a70d5c2e81b18eb Mon Sep 17 00:00:00 2001
From: Ankush Menat 
Date: Wed, 9 Aug 2023 13:45:07 +0530
Subject: [PATCH 76/81] perf: lower limit for global search

---
 frappe/public/js/frappe/ui/toolbar/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js
index cfbfa72f7e..3f9edeb1f5 100644
--- a/frappe/public/js/frappe/ui/toolbar/search.js
+++ b/frappe/public/js/frappe/ui/toolbar/search.js
@@ -51,7 +51,7 @@ frappe.search.SearchDialog = class {
 				no_results_status: () => __("No Results found"),
 				get_results: (keywords, callback) => {
 					let start = 0,
-						limit = 1000;
+						limit = 100;
 					let results = frappe.search.utils.get_nav_results(keywords);
 					frappe.search.utils.get_global_results(keywords, start, limit).then(
 						(global_results) => {

From 20c2ce8d29693bd08239606ecbfa2e2bcec16f21 Mon Sep 17 00:00:00 2001
From: Ankush Menat 
Date: Wed, 9 Aug 2023 14:04:41 +0530
Subject: [PATCH 77/81] fix: disable activity log global search

has millions of record that don't need to be searched
"globally"

[skip ci]
---
 frappe/core/doctype/activity_log/activity_log.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/core/doctype/activity_log/activity_log.json b/frappe/core/doctype/activity_log/activity_log.json
index b272bab180..c6c4b2102b 100644
--- a/frappe/core/doctype/activity_log/activity_log.json
+++ b/frappe/core/doctype/activity_log/activity_log.json
@@ -33,7 +33,6 @@
   {
    "fieldname": "subject",
    "fieldtype": "Small Text",
-   "in_global_search": 1,
    "in_list_view": 1,
    "label": "Subject",
    "reqd": 1

From c0f9e8d54f1d8e1728e0711c307d74ac354c75f4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 9 Aug 2023 16:08:14 +0530
Subject: [PATCH 78/81] fix: ignore_user_type can be applied by System User
 (#21990)

---
 frappe/core/doctype/user/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 3a4fa12e91..6496752855 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -1042,7 +1042,7 @@ def user_query(doctype, txt, searchfield, start, page_len, filters):
 	conditions = []
 
 	user_type_condition = "and user_type != 'Website User'"
-	if filters and filters.get("ignore_user_type"):
+	if filters and filters.get("ignore_user_type") and frappe.session.data.user_type == "System User":
 		user_type_condition = ""
 		filters.pop("ignore_user_type")
 

From fde516b06f896dcd54be749b76c6ea1a40bf325c Mon Sep 17 00:00:00 2001
From: anandbaburajan 
Date: Wed, 9 Aug 2023 16:57:32 +0530
Subject: [PATCH 79/81] chore: use new_doctype for creating test doctypes

---
 frappe/core/doctype/doctype/test_doctype.py |   3 +-
 frappe/tests/test_dashboard_connections.py  | 129 +++++++++-----------
 2 files changed, 57 insertions(+), 75 deletions(-)

diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py
index 40c55c594e..b3c2cadc22 100644
--- a/frappe/core/doctype/doctype/test_doctype.py
+++ b/frappe/core/doctype/doctype/test_doctype.py
@@ -777,6 +777,7 @@ def new_doctype(
 	unique: bool = False,
 	depends_on: str = "",
 	fields: list[dict] | None = None,
+	custom: bool = True,
 	**kwargs,
 ):
 	if not name:
@@ -787,7 +788,7 @@ def new_doctype(
 		{
 			"doctype": "DocType",
 			"module": "Core",
-			"custom": 1,
+			"custom": custom,
 			"fields": [
 				{
 					"label": "Some Field",
diff --git a/frappe/tests/test_dashboard_connections.py b/frappe/tests/test_dashboard_connections.py
index bfcc9d4a1b..3b3764698c 100644
--- a/frappe/tests/test_dashboard_connections.py
+++ b/frappe/tests/test_dashboard_connections.py
@@ -5,6 +5,7 @@ from unittest.mock import patch
 
 import frappe
 import frappe.utils
+from frappe.core.doctype.doctype.test_doctype import new_doctype
 from frappe.desk.notifications import get_open_count
 from frappe.tests.utils import FrappeTestCase
 
@@ -139,36 +140,24 @@ def delete_test_data():
 
 
 def create_child_table_with_link_to_doctype_a():
-	frappe.get_doc(
-		{
-			"doctype": "DocType",
-			"name": "Child Table With Link To Doctype A",
-			"module": "Custom",
-			"autoname": "field:title",
-			"fields": [
-				{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}
-			],
-			"istable": 1,
-			"naming_rule": "By fieldname",
-			"permissions": [{"role": "System Manager"}],
-		}
+	new_doctype(
+		"Child Table With Link To Doctype A",
+		istable=1,
+		fields=[{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}],
+		custom=False,
+		autoname="field:title",
+		naming_rule="By fieldname",
 	).insert(ignore_if_duplicate=True)
 
 
 def create_child_table_with_link_to_doctype_b():
-	frappe.get_doc(
-		{
-			"doctype": "DocType",
-			"name": "Child Table With Link To Doctype B",
-			"module": "Custom",
-			"autoname": "field:title",
-			"fields": [
-				{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}
-			],
-			"istable": 1,
-			"naming_rule": "By fieldname",
-			"permissions": [{"role": "System Manager"}],
-		}
+	new_doctype(
+		"Child Table With Link To Doctype B",
+		istable=1,
+		fields=[{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}],
+		custom=False,
+		autoname="field:title",
+		naming_rule="By fieldname",
 	).insert(ignore_if_duplicate=True)
 
 
@@ -207,58 +196,50 @@ def add_links_in_child_tables():
 
 
 def create_doctype_a_with_child_table_with_link_to_doctype_b():
-	frappe.get_doc(
-		{
-			"doctype": "DocType",
-			"name": "Doctype A With Child Table With Link To Doctype B",
-			"module": "Custom",
-			"autoname": "field:title",
-			"fields": [
-				{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
-				{
-					"fieldname": "child_table",
-					"fieldtype": "Table",
-					"label": "Child Table",
-					"options": "Child Table With Link To Doctype B",
-				},
-				{
-					"fieldname": "connections_tab",
-					"fieldtype": "Tab Break",
-					"label": "Connections",
-					"show_dashboard": 1,
-				},
-			],
-			"naming_rule": "By fieldname",
-			"permissions": [{"role": "System Manager"}],
-		}
+	new_doctype(
+		"Doctype A With Child Table With Link To Doctype B",
+		fields=[
+			{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
+			{
+				"fieldname": "child_table",
+				"fieldtype": "Table",
+				"label": "Child Table",
+				"options": "Child Table With Link To Doctype B",
+			},
+			{
+				"fieldname": "connections_tab",
+				"fieldtype": "Tab Break",
+				"label": "Connections",
+				"show_dashboard": 1,
+			},
+		],
+		custom=False,
+		autoname="field:title",
+		naming_rule="By fieldname",
 	).insert(ignore_if_duplicate=True)
 
 
 def create_doctype_b_with_child_table_with_link_to_doctype_a():
-	frappe.get_doc(
-		{
-			"doctype": "DocType",
-			"name": "Doctype B With Child Table With Link To Doctype A",
-			"module": "Custom",
-			"autoname": "field:title",
-			"fields": [
-				{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
-				{
-					"fieldname": "child_table",
-					"fieldtype": "Table",
-					"label": "Child Table",
-					"options": "Child Table With Link To Doctype A",
-				},
-				{
-					"fieldname": "connections_tab",
-					"fieldtype": "Tab Break",
-					"label": "Connections",
-					"show_dashboard": 1,
-				},
-			],
-			"naming_rule": "By fieldname",
-			"permissions": [{"role": "System Manager"}],
-		}
+	new_doctype(
+		"Doctype B With Child Table With Link To Doctype A",
+		fields=[
+			{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
+			{
+				"fieldname": "child_table",
+				"fieldtype": "Table",
+				"label": "Child Table",
+				"options": "Child Table With Link To Doctype A",
+			},
+			{
+				"fieldname": "connections_tab",
+				"fieldtype": "Tab Break",
+				"label": "Connections",
+				"show_dashboard": 1,
+			},
+		],
+		custom=False,
+		autoname="field:title",
+		naming_rule="By fieldname",
 	).insert(ignore_if_duplicate=True)
 
 

From 6ddc3654c6807b988f6433c6745a004c5801e0ab Mon Sep 17 00:00:00 2001
From: anandbaburajan 
Date: Wed, 9 Aug 2023 17:19:02 +0530
Subject: [PATCH 80/81] chore: add test prefix before test doctypes

---
 frappe/tests/test_dashboard_connections.py | 106 +++++++++++----------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/frappe/tests/test_dashboard_connections.py b/frappe/tests/test_dashboard_connections.py
index 3b3764698c..3a3ec14b74 100644
--- a/frappe/tests/test_dashboard_connections.py
+++ b/frappe/tests/test_dashboard_connections.py
@@ -23,7 +23,7 @@ class TestDashboardConnections(FrappeTestCase):
 	def test_internal_link_count(self):
 		earth = frappe.get_doc(
 			{
-				"doctype": "Doctype B With Child Table With Link To Doctype A",
+				"doctype": "Test Doctype B With Child Table With Link To Doctype A",
 				"title": "Earth",
 			}
 		)
@@ -37,13 +37,13 @@ class TestDashboardConnections(FrappeTestCase):
 
 		mars = frappe.get_doc(
 			{
-				"doctype": "Doctype A With Child Table With Link To Doctype B",
+				"doctype": "Test Doctype A With Child Table With Link To Doctype B",
 				"title": "Mars",
 			}
 		)
 		mars.append(
 			"child_table",
-			{"title": "Mars", "doctype_b_with_child_table_with_link_to_doctype_a": "Earth"},
+			{"title": "Mars", "test_doctype_b_with_test_child_table_with_link_to_doctype_a": "Earth"},
 		)
 		mars.insert()
 
@@ -53,7 +53,7 @@ class TestDashboardConnections(FrappeTestCase):
 				"internal_links_found": [
 					{
 						"count": 1,
-						"doctype": "Doctype B With Child Table With Link To Doctype A",
+						"doctype": "Test Doctype B With Child Table With Link To Doctype A",
 						"names": ["Earth"],
 						"open_count": 0,
 					}
@@ -64,17 +64,17 @@ class TestDashboardConnections(FrappeTestCase):
 		with patch.object(
 			mars.meta,
 			"get_dashboard_data",
-			return_value=get_dashboard_for_doctype_a_with_child_table_with_link_to_doctype_b(),
+			return_value=get_dashboard_for_test_doctype_a_with_test_child_table_with_link_to_doctype_b(),
 		):
 			self.assertEqual(
-				get_open_count("Doctype A With Child Table With Link To Doctype B", "Mars"),
+				get_open_count("Test Doctype A With Child Table With Link To Doctype B", "Mars"),
 				expected_open_count,
 			)
 
 	def test_external_link_count(self):
 		saturn = frappe.get_doc(
 			{
-				"doctype": "Doctype A With Child Table With Link To Doctype B",
+				"doctype": "Test Doctype A With Child Table With Link To Doctype B",
 				"title": "Saturn",
 			}
 		)
@@ -88,20 +88,24 @@ class TestDashboardConnections(FrappeTestCase):
 
 		pluto = frappe.get_doc(
 			{
-				"doctype": "Doctype B With Child Table With Link To Doctype A",
+				"doctype": "Test Doctype B With Child Table With Link To Doctype A",
 				"title": "Pluto",
 			}
 		)
 		pluto.append(
 			"child_table",
-			{"title": "Pluto", "doctype_a_with_child_table_with_link_to_doctype_b": "Saturn"},
+			{"title": "Pluto", "test_doctype_a_with_test_child_table_with_link_to_doctype_b": "Saturn"},
 		)
 		pluto.insert()
 
 		expected_open_count = {
 			"count": {
 				"external_links_found": [
-					{"doctype": "Doctype B With Child Table With Link To Doctype A", "open_count": 0, "count": 1}
+					{
+						"doctype": "Test Doctype B With Child Table With Link To Doctype A",
+						"open_count": 0,
+						"count": 1,
+					}
 				],
 				"internal_links_found": [],
 			}
@@ -110,28 +114,28 @@ class TestDashboardConnections(FrappeTestCase):
 		with patch.object(
 			saturn.meta,
 			"get_dashboard_data",
-			return_value=get_dashboard_for_doctype_a_with_child_table_with_link_to_doctype_b(),
+			return_value=get_dashboard_for_test_doctype_a_with_test_child_table_with_link_to_doctype_b(),
 		):
 			self.assertEqual(
-				get_open_count("Doctype A With Child Table With Link To Doctype B", "Saturn"),
+				get_open_count("Test Doctype A With Child Table With Link To Doctype B", "Saturn"),
 				expected_open_count,
 			)
 
 
 def create_test_data():
-	create_child_table_with_link_to_doctype_a()
-	create_child_table_with_link_to_doctype_b()
-	create_doctype_a_with_child_table_with_link_to_doctype_b()
-	create_doctype_b_with_child_table_with_link_to_doctype_a()
+	create_test_child_table_with_link_to_doctype_a()
+	create_test_child_table_with_link_to_doctype_b()
+	create_test_doctype_a_with_test_child_table_with_link_to_doctype_b()
+	create_test_doctype_b_with_test_child_table_with_link_to_doctype_a()
 	add_links_in_child_tables()
 
 
 def delete_test_data():
 	doctypes = [
-		"Child Table With Link To Doctype A",
-		"Child Table With Link To Doctype B",
-		"Doctype A With Child Table With Link To Doctype B",
-		"Doctype B With Child Table With Link To Doctype A",
+		"Test Child Table With Link To Doctype A",
+		"Test Child Table With Link To Doctype B",
+		"Test Doctype A With Child Table With Link To Doctype B",
+		"Test Doctype B With Child Table With Link To Doctype A",
 	]
 	for doctype in doctypes:
 		if frappe.db.table_exists(doctype):
@@ -139,9 +143,9 @@ def delete_test_data():
 			frappe.delete_doc("DocType", doctype, force=True)
 
 
-def create_child_table_with_link_to_doctype_a():
+def create_test_child_table_with_link_to_doctype_a():
 	new_doctype(
-		"Child Table With Link To Doctype A",
+		"Test Child Table With Link To Doctype A",
 		istable=1,
 		fields=[{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}],
 		custom=False,
@@ -150,9 +154,9 @@ def create_child_table_with_link_to_doctype_a():
 	).insert(ignore_if_duplicate=True)
 
 
-def create_child_table_with_link_to_doctype_b():
+def create_test_child_table_with_link_to_doctype_b():
 	new_doctype(
-		"Child Table With Link To Doctype B",
+		"Test Child Table With Link To Doctype B",
 		istable=1,
 		fields=[{"fieldname": "title", "fieldtype": "Data", "label": "Title", "reqd": 1, "unique": 1}],
 		custom=False,
@@ -162,49 +166,49 @@ def create_child_table_with_link_to_doctype_b():
 
 
 def add_links_in_child_tables():
-	child_table_with_link_to_doctype_a = frappe.get_doc(
-		"DocType", "Child Table With Link To Doctype A"
+	test_child_table_with_link_to_doctype_a = frappe.get_doc(
+		"DocType", "Test Child Table With Link To Doctype A"
 	)
-	if len(child_table_with_link_to_doctype_a.fields) == 1:
-		child_table_with_link_to_doctype_a.append(
+	if len(test_child_table_with_link_to_doctype_a.fields) == 1:
+		test_child_table_with_link_to_doctype_a.append(
 			"fields",
 			{
-				"fieldname": "doctype_a_with_child_table_with_link_to_doctype_b",
+				"fieldname": "test_doctype_a_with_test_child_table_with_link_to_doctype_b",
 				"fieldtype": "Link",
 				"in_list_view": 1,
-				"label": "Doctype A With Child Table With Link To Doctype B" or "Doctype to Link",
-				"options": "Doctype A With Child Table With Link To Doctype B" or "Doctype to Link",
+				"label": "Test Doctype A With Child Table With Link To Doctype B" or "Doctype to Link",
+				"options": "Test Doctype A With Child Table With Link To Doctype B" or "Doctype to Link",
 			},
 		)
-		child_table_with_link_to_doctype_a.save()
+		test_child_table_with_link_to_doctype_a.save()
 
-	child_table_with_link_to_doctype_b = frappe.get_doc(
-		"DocType", "Child Table With Link To Doctype B"
+	test_child_table_with_link_to_doctype_b = frappe.get_doc(
+		"DocType", "Test Child Table With Link To Doctype B"
 	)
-	if len(child_table_with_link_to_doctype_b.fields) == 1:
-		child_table_with_link_to_doctype_b.append(
+	if len(test_child_table_with_link_to_doctype_b.fields) == 1:
+		test_child_table_with_link_to_doctype_b.append(
 			"fields",
 			{
-				"fieldname": "doctype_b_with_child_table_with_link_to_doctype_a",
+				"fieldname": "test_doctype_b_with_test_child_table_with_link_to_doctype_a",
 				"fieldtype": "Link",
 				"in_list_view": 1,
-				"label": "Doctype B With Child Table With Link To Doctype A" or "Doctype to Link",
-				"options": "Doctype B With Child Table With Link To Doctype A" or "Doctype to Link",
+				"label": "Test Doctype B With Child Table With Link To Doctype A" or "Doctype to Link",
+				"options": "Test Doctype B With Child Table With Link To Doctype A" or "Doctype to Link",
 			},
 		)
-		child_table_with_link_to_doctype_b.save()
+		test_child_table_with_link_to_doctype_b.save()
 
 
-def create_doctype_a_with_child_table_with_link_to_doctype_b():
+def create_test_doctype_a_with_test_child_table_with_link_to_doctype_b():
 	new_doctype(
-		"Doctype A With Child Table With Link To Doctype B",
+		"Test Doctype A With Child Table With Link To Doctype B",
 		fields=[
 			{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
 			{
 				"fieldname": "child_table",
 				"fieldtype": "Table",
 				"label": "Child Table",
-				"options": "Child Table With Link To Doctype B",
+				"options": "Test Child Table With Link To Doctype B",
 			},
 			{
 				"fieldname": "connections_tab",
@@ -219,16 +223,16 @@ def create_doctype_a_with_child_table_with_link_to_doctype_b():
 	).insert(ignore_if_duplicate=True)
 
 
-def create_doctype_b_with_child_table_with_link_to_doctype_a():
+def create_test_doctype_b_with_test_child_table_with_link_to_doctype_a():
 	new_doctype(
-		"Doctype B With Child Table With Link To Doctype A",
+		"Test Doctype B With Child Table With Link To Doctype A",
 		fields=[
 			{"fieldname": "title", "fieldtype": "Data", "label": "Title", "unique": 1},
 			{
 				"fieldname": "child_table",
 				"fieldtype": "Table",
 				"label": "Child Table",
-				"options": "Child Table With Link To Doctype A",
+				"options": "Test Child Table With Link To Doctype A",
 			},
 			{
 				"fieldname": "connections_tab",
@@ -243,19 +247,19 @@ def create_doctype_b_with_child_table_with_link_to_doctype_a():
 	).insert(ignore_if_duplicate=True)
 
 
-def get_dashboard_for_doctype_a_with_child_table_with_link_to_doctype_b():
+def get_dashboard_for_test_doctype_a_with_test_child_table_with_link_to_doctype_b():
 	dashboard = frappe._dict()
 
 	data = {
-		"fieldname": "doctype_a_with_child_table_with_link_to_doctype_b",
+		"fieldname": "test_doctype_a_with_test_child_table_with_link_to_doctype_b",
 		"internal_links": {
-			"Doctype B With Child Table With Link To Doctype A": [
+			"Test Doctype B With Child Table With Link To Doctype A": [
 				"child_table",
-				"doctype_b_with_child_table_with_link_to_doctype_a",
+				"test_doctype_b_with_test_child_table_with_link_to_doctype_a",
 			],
 		},
 		"transactions": [
-			{"label": "Reference", "items": ["Doctype B With Child Table With Link To Doctype A"]},
+			{"label": "Reference", "items": ["Test Doctype B With Child Table With Link To Doctype A"]},
 		],
 	}
 

From 94e522185d53668ef50cae82ef58faacc0e6b4c1 Mon Sep 17 00:00:00 2001
From: Ankush Menat 
Date: Thu, 10 Aug 2023 10:02:16 +0530
Subject: [PATCH 81/81] fix: configurable rename job queue (#21996)

This is useful for doctypes like company where very large number of
documents will be affected on a large DB.

original change:

fix: move rename enqueue action to long queue

When trying to rename company the job constantly fails.

possibly alternate fix to https://github.com/frappe/frappe/pull/21995

Job timed out because of 300 seconds timeout, no amount of optimization
will fix this because it's rewriting practically every row in
transactions.
---
 frappe/model/rename_doc.py              | 4 +++-
 frappe/public/js/frappe/form/toolbar.js | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py
index e8f5626af4..7554755d2b 100644
--- a/frappe/model/rename_doc.py
+++ b/frappe/model/rename_doc.py
@@ -65,6 +65,8 @@ def update_document_title(
 	)
 	name_updated = updated_name and (updated_name != doc.name)
 
+	queue = kwargs.get("queue") or "default"
+
 	if name_updated:
 		if action_enqueued:
 			current_name = doc.name
@@ -86,7 +88,7 @@ def update_document_title(
 				save_point=True,
 			)
 
-			doc.queue_action("rename", name=transformed_name, merge=merge)
+			doc.queue_action("rename", name=transformed_name, merge=merge, queue=queue)
 		else:
 			doc.rename(updated_name, merge=merge)
 
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index e6c24e304c..4d6f96caca 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -98,6 +98,10 @@ frappe.ui.form.Toolbar = class Toolbar {
 		const docname = this.frm.doc.name;
 		const title_field = this.frm.meta.title_field || "";
 		const doctype = this.frm.doctype;
+		let queue;
+		if (this.frm.__rename_queue) {
+			queue = this.frm.__rename_queue;
+		}
 
 		if (input_name) {
 			const warning = __("This cannot be undone");
@@ -120,6 +124,7 @@ frappe.ui.form.Toolbar = class Toolbar {
 					merge,
 					freeze: true,
 					freeze_message: __("Updating related fields..."),
+					queue,
 				})
 				.then((new_docname) => {
 					const reload_form = (input_name) => {