From 55e2af20c66b7bf490ae3c4cfb5d3f4d58e885ca Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 7 Sep 2021 17:51:46 +0530 Subject: [PATCH 01/80] feat: Enhancements in Server Script --- frappe/utils/safe_exec.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 2e27859faa..3fb55af926 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -111,6 +111,7 @@ def get_safe_globals(): get_hooks=frappe.get_hooks, sanitize_html=frappe.utils.sanitize_html, log_error=frappe.log_error + cache=frappe.cache ), FrappeClient=FrappeClient, style=frappe._dict( @@ -141,7 +142,8 @@ def get_safe_globals(): get_single_value = frappe.db.get_single_value, get_default = frappe.db.get_default, escape = frappe.db.escape, - sql = read_sql + sql = read_sql, + commit = frappe.db.commit ) if frappe.response: From a1251aace99bef5166925e79926a146f79bd7cb6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 7 Sep 2021 18:29:04 +0530 Subject: [PATCH 02/80] fix: Syntax Error --- 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 3fb55af926..983e4aabf8 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -110,7 +110,7 @@ def get_safe_globals(): socketio_port=frappe.conf.socketio_port, get_hooks=frappe.get_hooks, sanitize_html=frappe.utils.sanitize_html, - log_error=frappe.log_error + log_error=frappe.log_error, cache=frappe.cache ), FrappeClient=FrappeClient, From dd563001096f957722f708e829cfe5c28a802d21 Mon Sep 17 00:00:00 2001 From: leela Date: Wed, 22 Sep 2021 18:20:57 +0530 Subject: [PATCH 03/80] fix: date mismatches while displaying in short form --- frappe/public/js/frappe/utils/pretty_date.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js index 84fd276068..3ebe2c1ae2 100644 --- a/frappe/public/js/frappe/utils/pretty_date.js +++ b/frappe/public/js/frappe/utils/pretty_date.js @@ -25,11 +25,11 @@ function prettyDate(date, mini) { if (day_diff < 7) { return __("{0} d", [day_diff]); } else if (day_diff < 31) { - return __("{0} w", [Math.ceil(day_diff / 7)]); + return __("{0} w", [Math.floor(day_diff / 7)]); } else if (day_diff < 365) { - return __("{0} M", [Math.ceil(day_diff / 30)]); + return __("{0} M", [Math.floor(day_diff / 30)]); } else { - return __("{0} y", [Math.ceil(day_diff / 365)]); + return __("{0} y", [Math.floor(day_diff / 365)]); } } } else { @@ -54,15 +54,15 @@ function prettyDate(date, mini) { } else if (day_diff < 14) { return __("1 week ago"); } else if (day_diff < 31) { - return __("{0} weeks ago", [Math.ceil(day_diff / 7)]); + return __("{0} weeks ago", [Math.floor(day_diff / 7)]); } else if (day_diff < 62) { return __("1 month ago"); } else if (day_diff < 365) { - return __("{0} months ago", [Math.ceil(day_diff / 30)]); + return __("{0} months ago", [Math.floor(day_diff / 30)]); } else if (day_diff < 730) { return __("1 year ago"); } else { - return __("{0} years ago", [Math.ceil(day_diff / 365)]); + return __("{0} years ago", [Math.floor(day_diff / 365)]); } } } From dffd78d3fca385dc4e5ee536beae93099746cdff Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 27 Sep 2021 12:02:31 +0530 Subject: [PATCH 04/80] fix: Validate server script for doc events --- frappe/core/doctype/server_script/server_script.py | 9 +++++++++ frappe/utils/safe_exec.py | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 79fe7a9140..8aa2dd0bae 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -11,6 +11,8 @@ from frappe.model.document import Document from frappe.utils.safe_exec import get_safe_globals, safe_exec, NamespaceDict from frappe import _ +import re + class ServerScript(Document): def validate(self): @@ -94,8 +96,15 @@ class ServerScript(Document): Args: doc (Document): Executes script with for a certain document's events """ + self.validate_script_for_doc_events() safe_exec(self.script, _locals={"doc": doc}) + def validate_script_for_doc_events(self): + for line in self.script.splitlines(): + line = line.strip() + if not line.startswith('#') and "frappe.db.commit()" in line: + frappe.throw(_("Commit cannot be used in DocType Event server script")) + def execute_scheduled_method(self): """Specific to Scheduled Jobs via Server Scripts diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 1c09a17a66..6f9398745e 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -116,8 +116,7 @@ def get_safe_globals(): socketio_port=frappe.conf.socketio_port, get_hooks=frappe.get_hooks, sanitize_html=frappe.utils.sanitize_html, - log_error=frappe.log_error, - cache=frappe.cache + log_error=frappe.log_error ), FrappeClient=FrappeClient, style=frappe._dict( @@ -157,6 +156,13 @@ def get_safe_globals(): commit = frappe.db.commit ) + out.frappe.cache = NamespaceDict( + get_value = frappe.cache().get_value, + set_value = frappe.cache().set_value, + hset = frappe.cache().hset, + hget = frappe.cache().hget + ) + if frappe.response: out.frappe.response = frappe.response From 6ab38e5d65406f927bfee1eeb708ae553a0f962d Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 27 Sep 2021 12:09:32 +0530 Subject: [PATCH 05/80] fix: Linting Issues --- frappe/core/doctype/server_script/server_script.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 8aa2dd0bae..03b33443eb 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -11,8 +11,6 @@ from frappe.model.document import Document from frappe.utils.safe_exec import get_safe_globals, safe_exec, NamespaceDict from frappe import _ -import re - class ServerScript(Document): def validate(self): From e13f99dcb1577a7bfaa26f206be4eb0389c7786f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 27 Sep 2021 12:56:08 +0530 Subject: [PATCH 06/80] test: Check for doc event validations and cache methods --- .../doctype/server_script/server_script.py | 4 +- .../server_script/test_server_script.py | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 03b33443eb..14f173f906 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -11,6 +11,8 @@ from frappe.model.document import Document from frappe.utils.safe_exec import get_safe_globals, safe_exec, NamespaceDict from frappe import _ +class CommitNotAllowed(frappe.ValidationError): + pass class ServerScript(Document): def validate(self): @@ -101,7 +103,7 @@ class ServerScript(Document): for line in self.script.splitlines(): line = line.strip() if not line.startswith('#') and "frappe.db.commit()" in line: - frappe.throw(_("Commit cannot be used in DocType Event server script")) + frappe.throw(_("Commit cannot be used in DocType Event server script"), CommitNotAllowed) def execute_scheduled_method(self): """Specific to Scheduled Jobs via Server Scripts diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index 6c028ff136..cf49430ff4 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -5,6 +5,7 @@ import frappe import unittest import requests from frappe.utils import get_site_url +from frappe.core.doctype.server_script.server_script import CommitNotAllowed scripts = [ dict( @@ -59,6 +60,26 @@ conditions = '1 = 1' reference_doctype = 'Note', script = ''' frappe.method_that_doesnt_exist("do some magic") +''' + ), + dict( + name='test_todo_commit', + script_type = 'DocType Event', + doctype_event = 'Before Save', + reference_doctype = 'ToDo', + disabled = 1, + script = ''' +frappe.db.commit() +''' + ), + dict( + name='test_cache_methods', + script_type = 'DocType Event', + doctype_event = 'Before Save', + reference_doctype = 'ToDo', + disabled = 1, + script = ''' +frappe.cache.set_value('test_key', doc.name) ''' ) ] @@ -119,3 +140,24 @@ class TestServerScript(unittest.TestCase): self.assertTrue("invalid python code" in str(se.exception).lower(), msg="Python code validation not working") + + def test_commit_in_doctype_event(self): + server_script = frappe.get_doc('Server Script', 'test_todo_commit') + server_script.disabled = 0 + server_script.save() + + self.assertRaises(CommitNotAllowed, frappe.get_doc(dict(doctype='ToDo', description='test me')).insert) + + server_script.disabled = 1 + server_script.save() + + def test_cache_methods_in_server_script(self): + server_script = frappe.get_doc('Server Script', 'test_cache_methods') + server_script.disabled = 0 + server_script.save() + + todo = frappe.get_doc(dict(doctype='ToDo', description='test me')).insert() + self.assertEqual(todo.name, frappe.cache().get_value('test_key')) + + server_script.disabled = 1 + server_script.save() From bfc68bdd956e33e9bc2839d3d37fa83bcf0b6392 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 28 Sep 2021 16:35:13 +0530 Subject: [PATCH 07/80] fix: Hide Show Filter if there is no saved filters --- frappe/public/js/frappe/list/list_filter.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/list/list_filter.js b/frappe/public/js/frappe/list/list_filter.js index 4c5a1da319..a3eadea8b3 100644 --- a/frappe/public/js/frappe/list/list_filter.js +++ b/frappe/public/js/frappe/list/list_filter.js @@ -26,6 +26,7 @@ export default class ListFilter { this.$input_area = this.wrapper.find('.input-area'); this.$list_filters = this.wrapper.find('.list-filters'); this.$saved_filters = this.wrapper.find('.saved-filters').hide(); + this.$saved_filters_preview = this.wrapper.find('.saved-filters-preview'); this.saved_filters_hidden = true; this.filter_input = frappe.ui.form.make_control({ @@ -57,6 +58,7 @@ export default class ListFilter { refresh() { this.get_list_filters().then(() => { + this.filters.length ? this.$saved_filters_preview.show() : this.$saved_filters_preview.hide(); const html = this.filters.map((filter) => this.filter_template(filter)); this.wrapper.find('.filter-pill').remove(); this.$saved_filters.append(html); From 624cd3a04cac9c69ed2ff95b65e5cc39c0e9cdd5 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 30 Sep 2021 16:21:20 +0530 Subject: [PATCH 08/80] fix: Scrollbar is hidden when search modal is minimized --- frappe/public/js/frappe/ui/dialog.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 58175381cf..b1a22c8929 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -78,6 +78,8 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.$wrapper .on("hide.bs.modal", function() { me.display = false; + me.is_minimized = false; + me.hide_scrollbar(false); if(frappe.ui.open_dialogs[frappe.ui.open_dialogs.length-1]===me) { frappe.ui.open_dialogs.pop(); @@ -96,6 +98,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { window.cur_dialog = me; frappe.ui.open_dialogs.push(me); me.focus_on_first_input(); + me.hide_scrollbar(true); me.on_page_show && me.on_page_show(); $(document).trigger('frappe.ui.Dialog:shown'); $(document).off('focusin.modal'); @@ -233,7 +236,11 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); - $("body").css("overflow", this.is_minimized ? "auto" : "hidden"); + this.hide_scrollbar(!this.is_minimized); + } + + hide_scrollbar(bool) { + $("body").css("overflow", bool ? "hidden" : "auto"); } add_custom_action(label, action, css_class=null) { From 4ebdabda485e19777bb64613d9eb0fefa3c76b27 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 4 Oct 2021 10:59:47 +0530 Subject: [PATCH 09/80] fix: Encapsulate cache methods --- .../doctype/server_script/test_server_script.py | 2 +- frappe/utils/safe_exec.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index cf49430ff4..a3de577ef2 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -79,7 +79,7 @@ frappe.db.commit() reference_doctype = 'ToDo', disabled = 1, script = ''' -frappe.cache.set_value('test_key', doc.name) +frappe.cache().set_value('test_key', doc.name) ''' ) ] diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 6f9398745e..79a103c9b3 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -156,12 +156,7 @@ def get_safe_globals(): commit = frappe.db.commit ) - out.frappe.cache = NamespaceDict( - get_value = frappe.cache().get_value, - set_value = frappe.cache().set_value, - hset = frappe.cache().hset, - hget = frappe.cache().hget - ) + out.frappe.cache = cache if frappe.response: out.frappe.response = frappe.response @@ -180,6 +175,14 @@ def get_safe_globals(): return out +def cache(): + return NamespaceDict( + get_value = frappe.cache().get_value, + set_value = frappe.cache().set_value, + hset = frappe.cache().hset, + hget = frappe.cache().hget + ) + def read_sql(query, *args, **kwargs): '''a wrapper for frappe.db.sql to allow reads''' if query.strip().split(None, 1)[0].lower() == 'select': From 5f83045baf70936fd3291784d70819fd442b6249 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 4 Oct 2021 12:26:12 +0530 Subject: [PATCH 10/80] feat: single thread discussions --- frappe/templates/discussions/comment_box.html | 3 +-- frappe/templates/discussions/discussions.js | 25 ++++++++++++------- .../discussions/discussions_section.html | 17 +++++++------ .../web_template/discussions/discussions.json | 11 ++++++-- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/frappe/templates/discussions/comment_box.html b/frappe/templates/discussions/comment_box.html index cbdc3ad3e5..ebaa37f772 100644 --- a/frappe/templates/discussions/comment_box.html +++ b/frappe/templates/discussions/comment_box.html @@ -25,8 +25,7 @@ {{ _("Cancel") }} -
+
{{ _("Post") }}
diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index becc50410d..8b36d0846c 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -87,12 +87,17 @@ const setup_socket_io = () => { }; const publish_message = (data) => { + const doctype = decodeURIComponent($(".discussions-parent .thread-card").attr("data-doctype")); + const docname = decodeURIComponent($(".discussions-parent .thread-card").attr("data-docname")); + const topic = data.topic_info; + + if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { - if ($(`.discussion-on-page[data-topic=${data.topic_info.name}]`).length) { post_message_cleanup(); - $('
' + data.template).insertBefore(`.discussion-on-page[data-topic=${data.topic_info.name}] .discussion-form`); - } else if ((decodeURIComponent($(".discussions-parent .discussions-card").attr("data-doctype")) == data.topic_info.reference_doctype - && decodeURIComponent($(".discussions-parent .discussions-card").attr("data-docname")) == data.topic_info.reference_docname)) { + $('
' + data.template) + .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); + + } else if (doctype == topic.reference_doctype && docname == topic.reference_docname) { post_message_cleanup(); data.new_topic_template = style_avatar_frame(data.new_topic_template); @@ -100,16 +105,18 @@ const publish_message = (data) => { $(data.sidebar).insertAfter(`.discussions-sidebar .form-group`); $(`#discussion-group`).prepend(data.new_topic_template); - if (data.topic_info.owner == frappe.session.user) { + if (topic.owner == frappe.session.user) { $(".discussion-on-page").collapse(); $(".sidebar-topic").first().click(); } - } else if (data.topic_info.owner == frappe.session.user) { + + } else if (topic.owner == frappe.session.user + && doctype == topic.reference_docname && docname == topic.reference_docname) { post_message_cleanup(); window.location.reload(); } - update_reply_count(data.topic_info.name); + update_reply_count(topic.name); }; const post_message_cleanup = () => { @@ -191,10 +198,10 @@ const submit_discussion = (e) => { const reply = $(".comment-field:visible").val().trim(); if (reply) { - let doctype = $(e.currentTarget).attr("data-doctype"); + let doctype = $(e.currentTarget).closest(".thread-card").attr("data-doctype"); doctype = doctype ? decodeURIComponent(doctype) : doctype; - let docname = $(e.currentTarget).attr("data-docname"); + let docname = $(e.currentTarget).closest(".thread-card").attr("data-docname"); docname = docname ? decodeURIComponent(docname) : docname; frappe.call({ diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index 65e1730bc7..b9fa80fe4f 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -11,10 +11,10 @@ {% endif %} - {% if topics %} -
+
+ {% if topics %}
{% include "frappe/templates/discussions/search.html" %} {% for topic in topics %} @@ -26,11 +26,14 @@
{% include "frappe/templates/discussions/reply_section.html" %}
-
- {% else %} -
-
+ {% elif not topics and single_thread %} +
+ {% include "frappe/templates/discussions/comment_box.html" %} +
+ + {% else %} +
No {{ title }}
There are no {{ title | lower }} for this {{ doctype | lower }}, why don't you start one!
diff --git a/frappe/website/web_template/discussions/discussions.json b/frappe/website/web_template/discussions/discussions.json index 8856787828..c8c90e08aa 100644 --- a/frappe/website/web_template/discussions/discussions.json +++ b/frappe/website/web_template/discussions/discussions.json @@ -22,10 +22,17 @@ "label": "Web Page", "options": "Web Page", "reqd": 1 + }, + { + "__unsaved": 1, + "fieldname": "single_thread", + "fieldtype": "Check", + "label": "Single Thread", + "reqd": 0 } ], "idx": 0, - "modified": "2021-10-01 12:15:28.876920", + "modified": "2021-10-01 15:15:57.366552", "modified_by": "Administrator", "module": "Website", "name": "Discussions", @@ -33,4 +40,4 @@ "standard": 1, "template": "", "type": "Section" -} +} \ No newline at end of file From 214e5b89d8e8b6dae140180addf2b79739d13c57 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 4 Oct 2021 20:56:44 +0530 Subject: [PATCH 11/80] fix: Filter pop-up overlaps the Notification Window --- frappe/public/scss/desk/filters.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/desk/filters.scss b/frappe/public/scss/desk/filters.scss index 3680adcf5c..d7a7ffbee7 100644 --- a/frappe/public/scss/desk/filters.scss +++ b/frappe/public/scss/desk/filters.scss @@ -8,6 +8,7 @@ min-width: 500px; min-height: 50px; font-size: var(--text-md); + z-index: 1019; } .filter-area { From 9c00a288690d703c7f1478b4ec0b88055f4bf924 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Tue, 5 Oct 2021 12:39:22 +0530 Subject: [PATCH 12/80] feat: Added safe_qb for server scripts --- frappe/utils/safe_exec.py | 52 ++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 0d1574b49a..a494df0e74 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -14,6 +14,8 @@ from frappe.www.printview import get_visible_columns import frappe.exceptions import frappe.integrations.utils from frappe.frappeclient import FrappeClient +from frappe.query_builder.utils import get_attr +from typing import get_type_hints class ServerScriptNotEnabled(frappe.PermissionError): pass @@ -29,6 +31,13 @@ class NamespaceDict(frappe._dict): return ret +query_class = get_attr(str(frappe.qb).split("'")[1]) +class SafeQb(query_class): + def __init__(self, *args, **kwargs): + _builder = get_type_hints(super()._builder).get('return') + _builder.run = read_sql + + def safe_exec(script, _globals=None, _locals=None): # server scripts can be disabled via site_config.json # they are enabled by default @@ -52,6 +61,7 @@ def safe_exec(script, _globals=None, _locals=None): def get_safe_globals(): datautils = frappe._dict() + safe_qb = SafeQb() if frappe.db: date_format = frappe.db.get_default("date_format") or "yyyy-mm-dd" time_format = frappe.db.get_default("time_format") or "HH:mm:ss" @@ -69,8 +79,8 @@ def get_safe_globals(): out = NamespaceDict( # make available limited methods of frappe json=NamespaceDict( - loads = json.loads, - dumps = json.dumps), + loads=json.loads, + dumps=json.dumps), dict=dict, log=frappe.log, _dict=frappe._dict, @@ -85,6 +95,7 @@ def get_safe_globals(): bold=frappe.bold, copy_doc=frappe.copy_doc, errprint=frappe.errprint, + qb=safe_qb, get_meta=frappe.get_meta, get_doc=frappe.get_doc, @@ -99,9 +110,9 @@ def get_safe_globals(): render_template=frappe.render_template, msgprint=frappe.msgprint, throw=frappe.throw, - sendmail = frappe.sendmail, - get_print = frappe.get_print, - attach_print = frappe.attach_print, + sendmail=frappe.sendmail, + get_print=frappe.get_print, + attach_print=frappe.attach_print, user=user, get_fullname=frappe.utils.get_fullname, @@ -112,8 +123,8 @@ def get_safe_globals(): user=user, csrf_token=frappe.local.session.data.csrf_token if getattr(frappe.local, "session", None) else '' ), - make_get_request = frappe.integrations.utils.make_get_request, - make_post_request = frappe.integrations.utils.make_post_request, + make_get_request=frappe.integrations.utils.make_get_request, + make_post_request=frappe.integrations.utils.make_post_request, socketio_port=frappe.conf.socketio_port, get_hooks=frappe.get_hooks, sanitize_html=frappe.utils.sanitize_html, @@ -141,19 +152,19 @@ def get_safe_globals(): out.frappe.date_format = date_format out.frappe.time_format = time_format out.frappe.db = NamespaceDict( - get_list = frappe.get_list, - get_all = frappe.get_all, - get_value = frappe.db.get_value, - set_value = frappe.db.set_value, - get_single_value = frappe.db.get_single_value, - get_default = frappe.db.get_default, - count = frappe.db.count, - min = frappe.db.min, - max = frappe.db.max, - avg = frappe.db.avg, - sum = frappe.db.sum, - escape = frappe.db.escape, - sql = read_sql + get_list=frappe.get_list, + get_all=frappe.get_all, + get_value=frappe.db.get_value, + set_value=frappe.db.set_value, + get_single_value=frappe.db.get_single_value, + get_default=frappe.db.get_default, + count=frappe.db.count, + min=frappe.db.min, + max=frappe.db.max, + avg=frappe.db.avg, + sum=frappe.db.sum, + escape=frappe.db.escape, + sql=read_sql ) if frappe.response: @@ -175,6 +186,7 @@ def get_safe_globals(): def read_sql(query, *args, **kwargs): '''a wrapper for frappe.db.sql to allow reads''' + query = str(query) if query.strip().split(None, 1)[0].lower() == 'select': return frappe.db.sql(query, *args, **kwargs) else: From 4e8f42288fd83f1fefb5e859f08307d832884ab3 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 5 Oct 2021 12:49:56 +0530 Subject: [PATCH 13/80] feat: single thread discussions --- frappe/templates/discussions/comment_box.html | 48 ++++++++++--------- frappe/templates/discussions/discussions.js | 25 ++++++---- .../discussions/discussions_section.html | 16 +++++-- .../templates/discussions/reply_section.html | 4 -- frappe/templates/styles/discussion_style.css | 2 +- .../discussion_reply/discussion_reply.py | 2 +- 6 files changed, 54 insertions(+), 43 deletions(-) diff --git a/frappe/templates/discussions/comment_box.html b/frappe/templates/discussions/comment_box.html index ebaa37f772..ab4714185a 100644 --- a/frappe/templates/discussions/comment_box.html +++ b/frappe/templates/discussions/comment_box.html @@ -1,31 +1,35 @@
-
-
-
- -
+ {% if not single_thread %} +
+
+
+
+
+ {% endif %} -
-
-
- -
+
+
+
+
+
-
-
- {{ _("Press Cmd+Enter to post your comment") }} -
- - {{ _("Cancel") }} -
- {{ _("Post") }}
+
+
+ {{ _("Press Cmd+Enter to post your comment") }}
- + + {{ _("Cancel") }} +
+ {{ _("Post") }} +
+
+ diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index 8b36d0846c..af49dc29d6 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -87,18 +87,23 @@ const setup_socket_io = () => { }; const publish_message = (data) => { - const doctype = decodeURIComponent($(".discussions-parent .thread-card").attr("data-doctype")); - const docname = decodeURIComponent($(".discussions-parent .thread-card").attr("data-docname")); + const doctype = decodeURIComponent($(".discussions-parent").attr("data-doctype")); + const docname = decodeURIComponent($(".discussions-parent").attr("data-docname")); const topic = data.topic_info; - if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { + console.log(topic, doctype, topic.reference_doctype, docname, topic.reference_docname, doctype == topic.reference_doctype, docname == topic.reference_docname) + console.log(topic.owner, frappe.session.user, topic.owner == frappe.session.user) + console.log(topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) + console.log(topic.title) + if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { + console.log("if") post_message_cleanup(); $('
' + data.template) .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); - } else if (doctype == topic.reference_doctype && docname == topic.reference_docname) { - + } else if (doctype == topic.reference_doctype && docname == topic.reference_docname && $(".reply-card").length) { + console.log("elif") post_message_cleanup(); data.new_topic_template = style_avatar_frame(data.new_topic_template); @@ -106,13 +111,13 @@ const publish_message = (data) => { $(`#discussion-group`).prepend(data.new_topic_template); if (topic.owner == frappe.session.user) { - $(".discussion-on-page").collapse(); + $(".discussion-on-page") && $(".discussion-on-page").collapse(); $(".sidebar-topic").first().click(); } - } else if (topic.owner == frappe.session.user - && doctype == topic.reference_docname && docname == topic.reference_docname) { + } else if (topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) { post_message_cleanup(); + console.log("in") window.location.reload(); } @@ -198,10 +203,10 @@ const submit_discussion = (e) => { const reply = $(".comment-field:visible").val().trim(); if (reply) { - let doctype = $(e.currentTarget).closest(".thread-card").attr("data-doctype"); + let doctype = $(e.currentTarget).closest(".discussions-parent").attr("data-doctype"); doctype = doctype ? decodeURIComponent(doctype) : doctype; - let docname = $(e.currentTarget).closest(".thread-card").attr("data-docname"); + let docname = $(e.currentTarget).closest(".discussions-parent").attr("data-docname"); docname = docname ? decodeURIComponent(docname) : docname; frappe.call({ diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index b9fa80fe4f..f62dde112e 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -1,9 +1,11 @@ {% set topics = frappe.get_all("Discussion Topic", {"reference_doctype": doctype, "reference_docname": docname}, ["name", "title", "owner", "creation"]) %} -{% include "frappe/templates/discussions/topic_modal.html" %} -
+
+ + {% include "frappe/templates/discussions/topic_modal.html" %} +
{{ _(title) }} {% if topics %} @@ -11,20 +13,24 @@ {% endif %}
- -
+
{% if topics %} + + {% if not single_thread %}
{% include "frappe/templates/discussions/search.html" %} + {% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name})%} {% include "frappe/templates/discussions/sidebar.html" %} {% endfor %}
+ {% endif %}
+ {% for topic in topics %} {% include "frappe/templates/discussions/reply_section.html" %} + {% endfor %}
{% elif not topics and single_thread %} diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index e2f86da5f9..0a9d3fdfbe 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -1,8 +1,6 @@ -{% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name}, ["reply", "owner", "creation"], order_by="creation")%} -{% if replies %}
@@ -34,5 +32,3 @@ {% endif %}
-{% endif %} -{% endfor %} diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 7aa6a02d5a..44f3a649fd 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -3,7 +3,7 @@ padding: 1rem; } -.discussions-parent .form-control { +.thread-card .form-control { background-color: #FFFFFF; font-size: inherit; color: inherit; diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.py b/frappe/website/doctype/discussion_reply/discussion_reply.py index 82e379c7d4..9665817fca 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.py +++ b/frappe/website/doctype/discussion_reply/discussion_reply.py @@ -27,7 +27,7 @@ class DiscussionReply(Document): }) new_topic_template = frappe.render_template("frappe/templates/discussions/reply_section.html", { - "topics": topic_info + "topic": topic_info[0] }) frappe.publish_realtime( From 25f694ab429308e83c9bcc4de194c5815e641360 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 5 Oct 2021 12:55:07 +0530 Subject: [PATCH 14/80] docs: frappe school link in readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6c2804d843..0ca60b9532 100644 --- a/README.md +++ b/README.md @@ -55,5 +55,9 @@ Full-stack web application framework that uses Python and MariaDB on the server For details and documentation, see the website [https://frappeframework.com](https://frappeframework.com) +## Learning + +1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. + ### License This repository has been released under the [MIT License](LICENSE). From f22101a9a4aa6409054060821277ce77bc9e72d4 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 5 Oct 2021 13:02:11 +0530 Subject: [PATCH 15/80] docs: making all headings same in readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0ca60b9532..6d1ad7b1c4 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,12 @@ Full-stack web application framework that uses Python and MariaDB on the server side and a tightly integrated client side library. Built for [ERPNext](https://erpnext.com) -### Table of Contents +## Table of Contents * [Installation](https://frappeframework.com/docs/user/en/installation) * [Documentation](https://frappeframework.com/docs) * [License](#license) -### Installation +## Installation * [Install via Docker](https://github.com/frappe/frappe_docker) * [Install via Frappe Bench](https://github.com/frappe/bench) @@ -50,7 +50,7 @@ Full-stack web application framework that uses Python and MariaDB on the server 1. [Contribution Guidelines](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) 1. [Translations](https://translate.erpnext.com) -### Website +## Website For details and documentation, see the website [https://frappeframework.com](https://frappeframework.com) @@ -59,5 +59,5 @@ For details and documentation, see the website 1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. -### License +## License This repository has been released under the [MIT License](LICENSE). From dca6dd2750bcefa4acab2123806240cbd1f5bcc7 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 5 Oct 2021 17:03:17 +0530 Subject: [PATCH 16/80] fix: Changing the drag icon in list settings --- frappe/public/js/frappe/list/list_settings.js | 4 ++-- frappe/public/js/frappe/utils/utils.js | 4 ++-- frappe/public/scss/desk/list.scss | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/list/list_settings.js b/frappe/public/js/frappe/list/list_settings.js index 4877d6fbb7..3a82935a53 100644 --- a/frappe/public/js/frappe/list/list_settings.js +++ b/frappe/public/js/frappe/list/list_settings.js @@ -114,14 +114,14 @@ export default class ListSettings {
- + ${frappe.utils.icon("drag", "xs", "", "sortable-handle " + show_sortable_handle)}
${me.fields[idx].label}
- + ${frappe.utils.icon("delete", "xs")}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index f534dff1c6..0a80bb081c 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1123,7 +1123,7 @@ Object.assign(frappe.utils, { } }, - icon(icon_name, size="sm", icon_class="") { + icon(icon_name, size="sm", icon_class="", svg_class="") { let size_class = ""; let icon_style = ""; if (typeof size == "object") { @@ -1131,7 +1131,7 @@ Object.assign(frappe.utils, { } else { size_class = `icon-${size}`; } - return ` + return ` `; }, diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index 1818f6d8b3..9c78dd0102 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -228,6 +228,10 @@ input.list-check-all, input.list-row-checkbox { z-index: 500; top: 0; } + + .sortable-handle { + cursor: -webkit-grabbing; + } } .list-items { From dc9f6a58c85ff2b02f5fc29930aca9eadbeb845f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 5 Oct 2021 17:26:52 +0530 Subject: [PATCH 17/80] fix: Resolved conflict --- frappe/public/js/frappe/list/list_settings.js | 2 +- frappe/public/js/frappe/utils/utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_settings.js b/frappe/public/js/frappe/list/list_settings.js index 3a82935a53..782a077a78 100644 --- a/frappe/public/js/frappe/list/list_settings.js +++ b/frappe/public/js/frappe/list/list_settings.js @@ -114,7 +114,7 @@ export default class ListSettings {
- ${frappe.utils.icon("drag", "xs", "", "sortable-handle " + show_sortable_handle)} + ${frappe.utils.icon("drag", "xs", "", "", "sortable-handle " + show_sortable_handle)}
${me.fields[idx].label} diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 0a80bb081c..825bd8c1a1 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1123,7 +1123,7 @@ Object.assign(frappe.utils, { } }, - icon(icon_name, size="sm", icon_class="", svg_class="") { + icon(icon_name, size="sm", icon_class="", icon_style="", svg_class="") { let size_class = ""; let icon_style = ""; if (typeof size == "object") { From 6c706ec00094a182c17435142fc6e468a22d6c4a Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Tue, 5 Oct 2021 18:13:32 +0530 Subject: [PATCH 18/80] fix: fixed multitenancy in safeqb --- frappe/utils/safe_exec.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index a494df0e74..d1e8be3f83 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -30,13 +30,20 @@ class NamespaceDict(frappe._dict): return default_function return ret +def get_safe_query_builder(): + """Allows execution of SELECT SQL queries only. -query_class = get_attr(str(frappe.qb).split("'")[1]) -class SafeQb(query_class): - def __init__(self, *args, **kwargs): - _builder = get_type_hints(super()._builder).get('return') - _builder.run = read_sql + Raises: + PermissionsError raised on execution of any other SQL query. + """ + query_class = get_attr(str(frappe.qb).split("'")[1]) + class SafeQB(query_class): + def __init__(self, *args, **kwargs): + _builder = get_type_hints(super()._builder).get('return') + _builder.run = read_sql + + return SafeQB() def safe_exec(script, _globals=None, _locals=None): # server scripts can be disabled via site_config.json @@ -61,7 +68,7 @@ def safe_exec(script, _globals=None, _locals=None): def get_safe_globals(): datautils = frappe._dict() - safe_qb = SafeQb() + safe_qb = get_safe_query_builder() if frappe.db: date_format = frappe.db.get_default("date_format") or "yyyy-mm-dd" time_format = frappe.db.get_default("time_format") or "HH:mm:ss" From 3b25bde3ac69b18407b47380eb22aae547545665 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Tue, 5 Oct 2021 18:14:06 +0530 Subject: [PATCH 19/80] feat: Added tests for SafeQB --- frappe/tests/test_safe_exec.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_safe_exec.py b/frappe/tests/test_safe_exec.py index 79f2c504a4..d1d6de45aa 100644 --- a/frappe/tests/test_safe_exec.py +++ b/frappe/tests/test_safe_exec.py @@ -23,4 +23,13 @@ class TestSafeExec(unittest.TestCase): safe_exec('''out = frappe.db.sql("select name from tabDocType where name='DocType'")''', None, _locals) self.assertEqual(_locals['out'][0][0], 'DocType') - self.assertRaises(frappe.PermissionError, safe_exec, 'frappe.db.sql("update tabToDo set description=NULL")') \ No newline at end of file + self.assertRaises(frappe.PermissionError, safe_exec, 'frappe.db.sql("update tabToDo set description=NULL")') + + def test_query_builder(self): + _locals = dict(out=None) + safe_exec(script='''out = frappe.qb.from_("User").select(frappe.qb.terms.PseudoColumn("Max(name)")).run()''', + _globals=None, _locals=_locals) + self.assertEqual(frappe.db.sql("SELECT Max(name) FROM tabUser"), _locals["out"]) + + def test_safe_query_builder(self): + self.assertRaises(frappe.PermissionError, safe_exec, '''frappe.qb.from_("User").delete().run()''') \ No newline at end of file From 2a241bd2dc3d166caa26be8e531a32385af06ea1 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Tue, 5 Oct 2021 18:23:46 +0530 Subject: [PATCH 20/80] style: formatted code --- frappe/tests/test_safe_exec.py | 3 +-- frappe/utils/safe_exec.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frappe/tests/test_safe_exec.py b/frappe/tests/test_safe_exec.py index d1d6de45aa..783d05ff37 100644 --- a/frappe/tests/test_safe_exec.py +++ b/frappe/tests/test_safe_exec.py @@ -27,8 +27,7 @@ class TestSafeExec(unittest.TestCase): def test_query_builder(self): _locals = dict(out=None) - safe_exec(script='''out = frappe.qb.from_("User").select(frappe.qb.terms.PseudoColumn("Max(name)")).run()''', - _globals=None, _locals=_locals) + safe_exec(script='''out = frappe.qb.from_("User").select(frappe.qb.terms.PseudoColumn("Max(name)")).run()''', _globals=None, _locals=_locals) self.assertEqual(frappe.db.sql("SELECT Max(name) FROM tabUser"), _locals["out"]) def test_safe_query_builder(self): diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index d1e8be3f83..9f52d17ef4 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -32,10 +32,8 @@ class NamespaceDict(frappe._dict): def get_safe_query_builder(): """Allows execution of SELECT SQL queries only. - Raises: - PermissionsError raised on execution of any other SQL query. - + PermissionsError raised on execution of any other SQL query """ query_class = get_attr(str(frappe.qb).split("'")[1]) class SafeQB(query_class): From 1d9000fd85346dbba2aae5850e07162bb9b445ef Mon Sep 17 00:00:00 2001 From: Sun Howwrongbum Date: Wed, 6 Oct 2021 14:21:03 +0530 Subject: [PATCH 21/80] feat: expose frappe.db.exists to Server Script --- frappe/utils/safe_exec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 0d1574b49a..1751d41b66 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -147,6 +147,7 @@ def get_safe_globals(): set_value = frappe.db.set_value, get_single_value = frappe.db.get_single_value, get_default = frappe.db.get_default, + exists = frappe.db.exists, count = frappe.db.count, min = frappe.db.min, max = frappe.db.max, From d254ca2f505833c6d74a5302c283b574f4d8ae9d Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 6 Oct 2021 17:37:20 +0530 Subject: [PATCH 22/80] fix: Make images in comments private --- frappe/core/doctype/file/file.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index d9ecd85533..569c6ab23b 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -839,6 +839,7 @@ def extract_images_from_html(doc, content): doctype = doc.parenttype if doc.parent else doc.doctype name = doc.parent or doc.name + is_private = True if doctype == "Comment" else False _file = frappe.get_doc({ "doctype": "File", @@ -846,7 +847,8 @@ def extract_images_from_html(doc, content): "attached_to_doctype": doctype, "attached_to_name": name, "content": content, - "decode": False + "decode": False, + "is_private": is_private }) _file.save(ignore_permissions=True) file_url = _file.file_url From e7ad5f2c29e7e3207696fbdb7042b9b277eb46a0 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 7 Oct 2021 09:38:40 +0530 Subject: [PATCH 23/80] fix: single thread without refresh --- frappe/templates/discussions/discussions.js | 21 ++++++++++--------- .../discussions/discussions_section.html | 17 +++++++-------- frappe/templates/discussions/reply_card.html | 4 ++-- .../templates/discussions/reply_section.html | 13 ++++++++++-- .../discussion_reply/discussion_reply.py | 11 +++++----- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index af49dc29d6..e04c8ae8c0 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -90,20 +90,16 @@ 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; - console.log(topic, doctype, topic.reference_doctype, docname, topic.reference_docname, doctype == topic.reference_doctype, docname == topic.reference_docname) - console.log(topic.owner, frappe.session.user, topic.owner == frappe.session.user) - - console.log(topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) - console.log(topic.title) if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { - console.log("if") post_message_cleanup(); $('
' + data.template) .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); - } else if (doctype == topic.reference_doctype && docname == topic.reference_docname && $(".reply-card").length) { - console.log("elif") + } else if (!first_topic && !single_thread && document_match_found) { post_message_cleanup(); data.new_topic_template = style_avatar_frame(data.new_topic_template); @@ -115,9 +111,14 @@ const publish_message = (data) => { $(".sidebar-topic").first().click(); } - } else if (topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) { + } else if (single_thread && document_match_found) { + post_message_cleanup(); + data.template = style_avatar_frame(data.template); + $(data.template).insertBefore(`.discussion-form`); + $(".discussion-on-page").attr("data-topic", topic.name); + + } else if (topic.owner == frappe.session.user && document_match_found) { post_message_cleanup(); - console.log("in") window.location.reload(); } diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index f62dde112e..57dc59c926 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -2,21 +2,22 @@ {"reference_doctype": doctype, "reference_docname": docname}, ["name", "title", "owner", "creation"]) %} -
+
{% include "frappe/templates/discussions/topic_modal.html" %}
{{ _(title) }} - {% if topics %} + {% if topics and not single_thread %} {% include "frappe/templates/discussions/button.html" %} {% endif %}
- {% if topics %} + {% if topics and not single_thread %} + - {% if not single_thread %}
{% include "frappe/templates/discussions/search.html" %} @@ -25,7 +26,6 @@ {% include "frappe/templates/discussions/sidebar.html" %} {% endfor %}
- {% endif %}
{% for topic in topics %} @@ -33,10 +33,9 @@ {% endfor %}
- {% elif not topics and single_thread %} -
- {% include "frappe/templates/discussions/comment_box.html" %} -
+ {% elif single_thread %} + {% set topic = topics[0] if topics | length else None %} + {% include "frappe/templates/discussions/reply_section.html" %} {% else %}
diff --git a/frappe/templates/discussions/reply_card.html b/frappe/templates/discussions/reply_card.html index ed9baf554a..5ff5261472 100644 --- a/frappe/templates/discussions/reply_card.html +++ b/frappe/templates/discussions/reply_card.html @@ -2,10 +2,10 @@
{% set member = frappe.db.get_value("User", reply.owner, ["name", "full_name", "username"], as_dict=True) %}
- {% if loop.index == 1 %} + {% if loop.index == 1 or single_thread %} {{ avatar(reply.owner) }} {% endif %} - + {{ member.full_name }}
{{ frappe.utils.pretty_date(reply.creation) }}
diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index 0a9d3fdfbe..516acf5e3b 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -1,14 +1,23 @@ +{% if topic %} + {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name}, ["reply", "owner", "creation"], order_by="creation")%} -
+{% endif %} +
+ + {% if not single_thread %}
{{ _("Back") }}
+ {% endif %} + {% if topic %}
{{ topic.title }}
+ {% endif %} + {% for reply in replies %} {% include "frappe/templates/discussions/reply_card.html" %} diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.py b/frappe/website/doctype/discussion_reply/discussion_reply.py index 9665817fca..d5913e6f29 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.py +++ b/frappe/website/doctype/discussion_reply/discussion_reply.py @@ -8,6 +8,10 @@ class DiscussionReply(Document): def after_insert(self): replies = frappe.db.count("Discussion Reply", {"topic": self.topic}) + topic_info = frappe.get_all("Discussion Topic", + {"name": self.topic}, + ["reference_doctype", "reference_docname", "name", "title", "owner", "creation"]) + template = frappe.render_template("frappe/templates/discussions/reply_card.html", { "reply": self, "topic": { @@ -15,13 +19,10 @@ class DiscussionReply(Document): }, "loop": { "index": replies - } + }, + "single_thread": True if not topic_info[0].title else False }) - topic_info = frappe.get_all("Discussion Topic", - {"name": self.topic}, - ["reference_doctype", "reference_docname", "name", "title", "owner", "creation"]) - sidebar = frappe.render_template("frappe/templates/discussions/sidebar.html", { "topic": topic_info[0] }) From 5387e48a5995039d0aa284da943922a214134b1b Mon Sep 17 00:00:00 2001 From: Anupam Date: Thu, 7 Oct 2021 11:24:25 +0530 Subject: [PATCH 24/80] fix: network printer settings permission issue --- .../network_printer_settings.json | 12 +++++++++++- frappe/printing/page/print/print.js | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/printing/doctype/network_printer_settings/network_printer_settings.json b/frappe/printing/doctype/network_printer_settings/network_printer_settings.json index cbef4b8ba4..11f1382225 100644 --- a/frappe/printing/doctype/network_printer_settings/network_printer_settings.json +++ b/frappe/printing/doctype/network_printer_settings/network_printer_settings.json @@ -41,10 +41,11 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-09-17 11:30:16.781655", + "modified": "2021-10-07 11:23:13.799402", "modified_by": "Administrator", "module": "Printing", "name": "Network Printer Settings", + "naming_rule": "Set by user", "owner": "Administrator", "permissions": [ { @@ -58,6 +59,15 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "All", + "share": 1 } ], "sort_field": "modified", diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js index 12a48eaa88..c1ab56b181 100644 --- a/frappe/printing/page/print/print.js +++ b/frappe/printing/page/print/print.js @@ -177,7 +177,7 @@ frappe.ui.form.PrintView = class { ); } - if (this.print_settings.enable_print_server) { + if (cint(this.print_settings.enable_print_server)) { this.page.add_menu_item(__('Select Network Printer'), () => this.network_printer_setting_dialog() ); From 3a5b967bfe5f178c3d948876beda8a596ff89f12 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 7 Oct 2021 12:45:18 +0530 Subject: [PATCH 25/80] docs: Update README * Fix Table of contents * Restructure and reword Resources section * Link code of conduct & security policy to README --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6d1ad7b1c4..2f9ed0c4dd 100644 --- a/README.md +++ b/README.md @@ -36,28 +36,28 @@ Full-stack web application framework that uses Python and MariaDB on the server side and a tightly integrated client side library. Built for [ERPNext](https://erpnext.com) ## Table of Contents -* [Installation](https://frappeframework.com/docs/user/en/installation) -* [Documentation](https://frappeframework.com/docs) +* [Installation](#installation) +* [Contributing](#contributing) +* [Resources](#resources) * [License](#license) ## Installation * [Install via Docker](https://github.com/frappe/frappe_docker) * [Install via Frappe Bench](https://github.com/frappe/bench) +* [Offical Documentation](https://frappeframework.com/docs/user/en/installation) ## Contributing +1. [Code of Conduct](CODE_OF_CONDUCT) 1. [Contribution Guidelines](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) +1. [Security Policy](SECURITY) 1. [Translations](https://translate.erpnext.com) -## Website +## Resources -For details and documentation, see the website -[https://frappeframework.com](https://frappeframework.com) - -## Learning - -1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. +1. [frappeframework.com](https://frappeframework.com) - Official documentation of the Frappe Framework. +1. [frappe.school](https://frappe.school) - Pick from the various courses by the maintainers or from the community. ## License This repository has been released under the [MIT License](LICENSE). From b34178a3844ea863ffe297aace3a1694817ff023 Mon Sep 17 00:00:00 2001 From: gavin Date: Thu, 7 Oct 2021 12:51:44 +0530 Subject: [PATCH 26/80] docs: Fix links in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f9ed0c4dd..c0d9966340 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ Full-stack web application framework that uses Python and MariaDB on the server ## Contributing -1. [Code of Conduct](CODE_OF_CONDUCT) +1. [Code of Conduct](CODE_OF_CONDUCT.md) 1. [Contribution Guidelines](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) -1. [Security Policy](SECURITY) +1. [Security Policy](SECURITY.md) 1. [Translations](https://translate.erpnext.com) ## Resources From bee24912213ae79e303013916f97617a124db456 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 7 Oct 2021 12:53:19 +0530 Subject: [PATCH 27/80] test: ui test for single thread --- cypress/integration/discussions.js | 16 ++++++++++++++++ frappe/templates/discussions/discussions.js | 4 +++- frappe/templates/discussions/reply_section.html | 2 +- frappe/tests/ui_test_helpers.py | 14 ++++++++------ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js index 3c055d1923..62cdd9d16f 100644 --- a/cypress/integration/discussions.js +++ b/cypress/integration/discussions.js @@ -57,7 +57,23 @@ context('Discussions', () => { cy.get('.discussion-on-page: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-on-page .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-on-page .submit-discussion').click(); + cy.wait(3000); + cy.get('.discussion-on-page').children(".reply-card").eq(-1).children(".reply-text") + .should('have.text', 'This comment is being made on a single thread discussion.\n'); + } + 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/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index e04c8ae8c0..19c0f89a49 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -96,6 +96,7 @@ const publish_message = (data) => { if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { post_message_cleanup(); + data.template = style_avatar_frame(data.template); $('
' + data.template) .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); @@ -245,7 +246,8 @@ const get_color_from_palette = (element) => { const style_avatar_frame = (template) => { const $template = $(template); - $template.find(".avatar-frame").css(get_color_from_palette($template.find(".avatar-frame"))); + $template.find(".avatar-frame").length + && $template.find(".avatar-frame").css(get_color_from_palette($template.find(".avatar-frame"))); return $template.prop("outerHTML"); }; diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index 516acf5e3b..c0be40ab01 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -14,7 +14,7 @@
{% endif %} - {% if topic %} + {% if topic and topic.title %}
{{ topic.title }}
{% endif %} diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 82dfe618c7..3e9b3519bc 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -194,16 +194,17 @@ def create_form_tour(): @frappe.whitelist() def create_data_for_discussions(): - web_page = create_web_page() + web_page = create_web_page("Test page for discussions", "test-page-discussions", False) create_topic_and_reply(web_page) + create_web_page("Test single thread discussion", "test-single-thread", True) -def create_web_page(): - web_page = frappe.db.exists("Web Page", {"route": "test-page-discussions"}) +def create_web_page(title, route, single_thread): + web_page = frappe.db.exists("Web Page", {"route": route}) if not web_page: web_page = frappe.get_doc({ "doctype": "Web Page", - "title": "Test page for discussions", - "route": "test-page-discussions", + "title": title, + "route": route, "published": True }) web_page.save() @@ -213,7 +214,8 @@ def create_web_page(): "web_template_values": frappe.as_json({ "title": "Discussions", "cta_title": "New Discussion", - "docname": web_page.name + "docname": web_page.name, + "single_thread": single_thread }) }) web_page.save() From d19864a6a7aceb0b964256a60fdb3ae8bacef8f8 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 7 Oct 2021 15:18:54 +0530 Subject: [PATCH 28/80] fix: sider --- cypress/integration/discussions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js index 62cdd9d16f..a6e0ff9b56 100644 --- a/cypress/integration/discussions.js +++ b/cypress/integration/discussions.js @@ -70,7 +70,7 @@ context('Discussions', () => { cy.wait(3000); cy.get('.discussion-on-page').children(".reply-card").eq(-1).children(".reply-text") .should('have.text', 'This comment is being made on a single thread discussion.\n'); - } + }; it('reply through modal', reply_through_modal); it('reply through comment box', reply_through_comment_box); From 0f73909d60ee5d60c5739b83e0bb60a6a0c45e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Chazelles?= Date: Wed, 29 Sep 2021 16:40:58 +0200 Subject: [PATCH 29/80] fix: include 'Duration' in fieldtype to fetch (cherry picked from commit 06ad3b534c3131504dcf481be29cb8e1a78739ae) --- frappe/public/js/frappe/form/script_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js index f960f4f767..f877a7cf8b 100644 --- a/frappe/public/js/frappe/form/script_manager.js +++ b/frappe/public/js/frappe/form/script_manager.js @@ -193,7 +193,7 @@ frappe.ui.form.ScriptManager = class ScriptManager { function setup_add_fetch(df) { if ((['Data', 'Read Only', 'Text', 'Small Text', 'Currency', 'Check', - 'Text Editor', 'Code', 'Link', 'Float', 'Int', 'Date', 'Select'].includes(df.fieldtype) || df.read_only==1) + 'Text Editor', 'Code', 'Link', 'Float', 'Int', 'Date', 'Select', 'Duration'].includes(df.fieldtype) || df.read_only==1) && df.fetch_from && df.fetch_from.indexOf(".")!=-1) { var parts = df.fetch_from.split("."); me.frm.add_fetch(parts[0], parts[1], df.fieldname); From 0879c35cbcff34a0784b64a4bb218cd96ac8ee83 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 7 Oct 2021 15:50:34 +0530 Subject: [PATCH 30/80] chore: Only show server side coverage for now --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0d9966340..f8a1907da2 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ - +
From 6b91ade73c07dc1c070ed137cf54a29a3e7b0993 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 7 Oct 2021 15:58:23 +0530 Subject: [PATCH 31/80] fix: `convert_dates_to_str` converts everything except `date` objects (#14340) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/model/base_document.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 5605ac61ed..1826cca9a3 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -267,7 +267,12 @@ class BaseDocument(object): if isinstance(d[fieldname], list) and df.fieldtype not in table_fields: frappe.throw(_('Value for {0} cannot be a list').format(_(df.label))) - if convert_dates_to_str and isinstance(d[fieldname], (datetime.datetime, datetime.time, datetime.timedelta)): + if convert_dates_to_str and isinstance(d[fieldname], ( + datetime.datetime, + datetime.date, + datetime.time, + datetime.timedelta + )): d[fieldname] = str(d[fieldname]) if d[fieldname] == None and ignore_nulls: From 6c450e9d9d560f3d4995dd885010f3e4e1513b4e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 7 Oct 2021 16:18:33 +0530 Subject: [PATCH 32/80] fix: Fixed minimized modal border shadow --- frappe/public/scss/common/modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss index 19975610e2..54843290fc 100644 --- a/frappe/public/scss/common/modal.scss +++ b/frappe/public/scss/common/modal.scss @@ -169,7 +169,7 @@ body.modal-open[style^="padding-right"] { border-radius: var(--border-radius-md); border-bottom-right-radius: 0; border-bottom-left-radius: 0; - box-shadow: -10px 10px rgba(0, 0, 0, 0.100661); + box-shadow: var(--shadow-lg); } @include media-breakpoint-down(sm) { From 05cb2c16cd037a9b6110a45295a46bfe2c07295b Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Thu, 7 Oct 2021 16:41:44 +0530 Subject: [PATCH 33/80] fix: Optional parameter for setting extracted image as private --- frappe/core/doctype/file/file.py | 3 +-- frappe/desk/form/utils.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 569c6ab23b..4df9ef3132 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -813,7 +813,7 @@ def extract_images_from_doc(doc, fieldname): doc.set(fieldname, content) -def extract_images_from_html(doc, content): +def extract_images_from_html(doc, content, is_private=False): frappe.flags.has_dataurl = False def _save_file(match): @@ -839,7 +839,6 @@ def extract_images_from_html(doc, content): doctype = doc.parenttype if doc.parent else doc.doctype name = doc.parent or doc.name - is_private = True if doctype == "Comment" else False _file = frappe.get_doc({ "doctype": "File", diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py index a4dcee4ab3..bd04e1915c 100644 --- a/frappe/desk/form/utils.py +++ b/frappe/desk/form/utils.py @@ -66,7 +66,7 @@ def add_comment(reference_doctype, reference_name, content, comment_email, comme comment_type='Comment', comment_by=comment_by )) - doc.content = extract_images_from_html(doc, content) + doc.content = extract_images_from_html(doc, content, is_private=True) doc.insert(ignore_permissions=True) follow_document(doc.reference_doctype, doc.reference_name, frappe.session.user) From 8653b90ec6b522ea857b03681b15082e1ae41365 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 7 Oct 2021 16:44:20 +0530 Subject: [PATCH 34/80] fix: Replacing -webkit-grabbing with grabbing --- frappe/public/scss/desk/desktop.scss | 9 ++++----- frappe/public/scss/desk/list.scss | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 2ab6d98e20..6ab01a744c 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -164,12 +164,11 @@ body { .drag-handle { cursor: all-scroll; - cursor: -webkit-grabbing; + cursor: grabbing; &:active { + cursor: all-scroll; cursor: grabbing; - cursor: -moz-grabbing; - cursor: -webkit-grabbing; } } @@ -813,7 +812,7 @@ body { .drag-handle { cursor: all-scroll; - cursor: -webkit-grabbing; + cursor: grabbing; display: none; } @@ -966,7 +965,7 @@ body { .drag-handle { cursor: all-scroll; - cursor: -webkit-grabbing; + cursor: grabbing; } } } diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index 9c78dd0102..4456acabb3 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -230,7 +230,8 @@ input.list-check-all, input.list-row-checkbox { } .sortable-handle { - cursor: -webkit-grabbing; + cursor: all-scroll; + cursor: grabbing; } } From f7a8ee7756fb0b684293077e078144d95cd1b66c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 7 Oct 2021 16:50:12 +0530 Subject: [PATCH 35/80] fix: custom dialog box not working --- frappe/public/js/frappe/form/grid.js | 22 ++++++++++++---------- frappe/public/js/frappe/form/grid_row.js | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 574543c3a6..1d302f5e1f 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -773,16 +773,18 @@ export default class Grid { } setup_user_defined_columns() { - let user_settings = frappe.get_user_settings(this.frm.doctype, 'GridView'); - if (user_settings && user_settings[this.doctype] && user_settings[this.doctype].length) { - this.user_defined_columns = user_settings[this.doctype].map(row => { - let column = frappe.meta.get_docfield(this.doctype, row.fieldname); - if (column) { - column.in_list_view = 1; - column.columns = row.columns; - return column; - } - }); + if (this.frm) { + let user_settings = frappe.get_user_settings(this.frm.doctype, 'GridView'); + if (user_settings && user_settings[this.doctype] && user_settings[this.doctype].length) { + this.user_defined_columns = user_settings[this.doctype].map(row => { + let column = frappe.meta.get_docfield(this.doctype, row.fieldname); + if (column) { + column.in_list_view = 1; + column.columns = row.columns; + return column; + } + }); + } } } diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 20a04ee206..de174cf37f 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -497,7 +497,7 @@ export default class GridRow { } update_user_settings_for_grid() { - if (!this.selected_columns_for_grid) { + if (!this.selected_columns_for_grid || !this.frm) { return; } From 6886036002a7860ddb349eadd8d0428d288a40a6 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 7 Oct 2021 17:32:45 +0530 Subject: [PATCH 36/80] feat: option to set the width for the multi-select dialog box --- frappe/public/js/frappe/form/multi_select_dialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js index ba522a4085..37b7e08a80 100644 --- a/frappe/public/js/frappe/form/multi_select_dialog.js +++ b/frappe/public/js/frappe/form/multi_select_dialog.js @@ -70,6 +70,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog { this.dialog = new frappe.ui.Dialog({ title: title, fields: this.fields, + size: this.size, primary_action_label: this.primary_action_label || __("Get Items"), secondary_action_label: __("Make {0}", [__(this.doctype)]), primary_action: () => { @@ -135,7 +136,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog { this.get_child_result().then(r => { this.child_results = r.message || []; this.render_child_datatable(); - + this.$wrapper.addClass('hidden'); this.$child_wrapper.removeClass('hidden'); this.dialog.fields_dict.more_btn.$wrapper.hide(); From 42acb7647f1eab113485e05d68d84228826523b0 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 7 Oct 2021 20:04:04 +0530 Subject: [PATCH 37/80] ci: Upgrade Py37 to Py39 --- .github/workflows/patch-mariadb-tests.yml | 2 +- .github/workflows/publish-assets-develop.yml | 2 +- .github/workflows/publish-assets-releases.yml | 2 +- .github/workflows/server-mariadb-tests.yml | 2 +- .github/workflows/server-postgres-tests.yml | 2 +- .github/workflows/ui-tests.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 56137d0bea..8758c4e273 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: '3.9' - name: Check if build should be run id: check-build diff --git a/.github/workflows/publish-assets-develop.yml b/.github/workflows/publish-assets-develop.yml index 85f3f7c3b0..f56d1460b5 100644 --- a/.github/workflows/publish-assets-develop.yml +++ b/.github/workflows/publish-assets-develop.yml @@ -18,7 +18,7 @@ jobs: node-version: 14 - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.9' - name: Set up bench and build assets run: | npm install -g yarn diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/publish-assets-releases.yml index a5cc1f8872..2582632fa0 100644 --- a/.github/workflows/publish-assets-releases.yml +++ b/.github/workflows/publish-assets-releases.yml @@ -21,7 +21,7 @@ jobs: python-version: '12.x' - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.9' - name: Set up bench and build assets run: | npm install -g yarn diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 2e50aa48f6..588f357f26 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: '3.9' - name: Check if build should be run id: check-build diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index 2203b657ad..78f379837b 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: '3.9' - name: Check if build should be run id: check-build diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index a9d331c44d..fcc53ba59c 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -37,7 +37,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: '3.9' - name: Check if build should be run id: check-build From 3537316a2a6d6804c6418c6e4bfa1ececfccaa1c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 7 Oct 2021 20:40:44 +0530 Subject: [PATCH 38/80] fix: Routing with hash in URL - Hash in document name should be encoded --- frappe/public/js/frappe/list/list_view.js | 2 +- frappe/public/js/frappe/router.js | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 1cf4b4c6ac..09072e106e 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -907,7 +907,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { return this.settings.get_form_link(doc); } - const docname = doc.name.match(/[%'"\s]/) + const docname = doc.name.match(/[%'"#\s]/) ? encodeURIComponent(doc.name) : doc.name; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 484f1ac911..349eadffb0 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -56,10 +56,6 @@ $('body').on('click', 'a', function(e) { return override(e.currentTarget.hash); } - if (frappe.router.is_app_route(e.currentTarget.pathname)) { - // target has "/app, this is a v2 style route. - return override(e.currentTarget.pathname + e.currentTarget.hash); - } }); frappe.router = { @@ -263,7 +259,9 @@ frappe.router = { return new Promise(resolve => { route = this.get_route_from_arguments(route); route = this.convert_from_standard_route(route); - const sub_path = this.make_url(route); + let sub_path = this.make_url(route); + // replace each # occurrences in the URL with encoded character except for last + // sub_path = sub_path.replace(/[#](?=.*[#])/g, "%23"); this.push_state(sub_path); setTimeout(() => { @@ -347,7 +345,7 @@ frappe.router = { return null; } else { a = String(a); - if (a && a.match(/[%'"\s\t]/)) { + if (a && a.match(/[%'"#\s\t]/)) { // if special chars, then encode a = encodeURIComponent(a); } @@ -374,7 +372,7 @@ frappe.router = { // return clean sub_path from hash or url // supports both v1 and v2 routing if (!route) { - route = window.location.pathname + window.location.hash + window.location.search; + route = window.location.pathname; if (route.includes('app#')) { // to support v1 route = window.location.hash; From f1c5fc4fe642fa8d88e6db01f4d6c6dda7e102b4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 7 Oct 2021 21:50:08 +0530 Subject: [PATCH 39/80] feat: Shareable link for comments and communications - Also, highlight comment/communication that has been shared. --- .../js/frappe/form/footer/base_timeline.js | 8 +++-- .../js/frappe/form/footer/form_timeline.js | 36 ++++++++++++------- frappe/public/js/frappe/form/form.js | 10 +++++- .../form/templates/timeline_message_box.html | 14 ++++++++ frappe/public/js/frappe/utils/utils.js | 16 +++++++-- frappe/public/scss/common/css_variables.scss | 2 ++ frappe/public/scss/desk/dark.scss | 2 ++ frappe/public/scss/desk/global.scss | 13 +++++++ frappe/public/scss/desk/timeline.scss | 2 +- 9 files changed, 84 insertions(+), 19 deletions(-) diff --git a/frappe/public/js/frappe/form/footer/base_timeline.js b/frappe/public/js/frappe/form/footer/base_timeline.js index 702d964442..beeba16459 100644 --- a/frappe/public/js/frappe/form/footer/base_timeline.js +++ b/frappe/public/js/frappe/form/footer/base_timeline.js @@ -97,9 +97,13 @@ class BaseTimeline { } timeline_item.append(`
`); - timeline_item.find('.timeline-content').append(item.content); + let timeline_content = timeline_item.find('.timeline-content'); + timeline_content.append(item.content); if (!item.hide_timestamp && !item.is_card) { - timeline_item.find('.timeline-content').append(` - ${comment_when(item.creation)}`); + timeline_content.append(` - ${comment_when(item.creation)}`); + } + if (item.id) { + timeline_content.attr("id", item.id); } return timeline_item; } diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js index b3feae3ee8..128bd355ad 100644 --- a/frappe/public/js/frappe/form/footer/form_timeline.js +++ b/frappe/public/js/frappe/form/footer/form_timeline.js @@ -96,6 +96,7 @@ class FormTimeline extends BaseTimeline { render_timeline_items() { super.render_timeline_items(); this.set_document_info(); + frappe.utils.bind_actions_with_object(this.timeline_items_wrapper, this); } set_document_info() { @@ -179,6 +180,7 @@ class FormTimeline extends BaseTimeline { is_card: true, content: this.get_communication_timeline_content(communication), doctype: "Communication", + id: `communication-${communication.name}`, name: communication.name }); }); @@ -246,6 +248,7 @@ class FormTimeline extends BaseTimeline { creation: comment.creation, is_card: true, doctype: "Comment", + id: `comment-${comment.name}`, name: comment.name, content: this.get_comment_timeline_content(comment), }; @@ -394,7 +397,7 @@ class FormTimeline extends BaseTimeline { } setup_reply(communication_box, communication_doc) { - let actions = communication_box.find('.actions'); + let actions = communication_box.find('.custom-actions'); let reply = $(`${frappe.utils.icon('reply', 'md')}`).click(() => { this.compose_mail(communication_doc); }); @@ -446,14 +449,16 @@ class FormTimeline extends BaseTimeline { let edit_wrapper = $(`
`).hide(); let edit_box = this.make_editable(edit_wrapper); let content_wrapper = comment_wrapper.find('.content'); - - let delete_button = $(); + let more_actions_wrapper = comment_wrapper.find('.more-actions'); if (frappe.model.can_delete("Comment")) { - delete_button = $(` - + const delete_option = $(` +
  • + + ${__("Delete")} + +
    • `).click(() => this.delete_comment(doc.name)); + more_actions_wrapper.find('.dropdown-menu').append(delete_option); } let dismiss_button = $(` @@ -493,15 +498,14 @@ class FormTimeline extends BaseTimeline { edit_button.toggle_edit_mode = () => { edit_button.edit_mode = !edit_button.edit_mode; edit_button.text(edit_button.edit_mode ? __('Save') : __('Edit')); - delete_button.toggle(!edit_button.edit_mode); + more_actions_wrapper.toggle(!edit_button.edit_mode); dismiss_button.toggle(edit_button.edit_mode); edit_wrapper.toggle(edit_button.edit_mode); content_wrapper.toggle(!edit_button.edit_mode); }; - - comment_wrapper.find('.actions').append(edit_button); - comment_wrapper.find('.actions').append(dismiss_button); - comment_wrapper.find('.actions').append(delete_button); + let actions_wrapper = comment_wrapper.find('.custom-actions'); + actions_wrapper.append(edit_button); + actions_wrapper.append(dismiss_button); } make_editable(container) { @@ -559,6 +563,14 @@ class FormTimeline extends BaseTimeline { }); }); } + + copy_link(ev) { + let doc_link = frappe.urllib.get_full_url( + frappe.utils.get_form_link(this.frm.doctype, this.frm.docname) + ); + let element_id = $(ev.currentTarget).closest(".timeline-content").attr("id"); + frappe.utils.copy_to_clipboard(`${doc_link}#${element_id}`); + } } export default FormTimeline; diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 97473c3069..a095956dfe 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -480,7 +480,11 @@ frappe.ui.form.Form = class FrappeForm { this.layout.show_empty_form_message(); } - this.scroll_to_element(); + frappe.after_ajax(() => { + $(document).ready(() => { + this.scroll_to_element(); + }); + }); } set_first_tab_as_active() { @@ -598,6 +602,8 @@ frappe.ui.form.Form = class FrappeForm { this.validate_form_action(save_action, resolve); var after_save = function(r) { + // to remove hash from URL to avoid scroll after save + history.replaceState(null, null, ' '); if(!r.exc) { if (["Save", "Update", "Amend"].indexOf(save_action)!==-1) { frappe.utils.play_sound("click"); @@ -1195,6 +1201,8 @@ frappe.ui.form.Form = class FrappeForm { if (selector.length) { frappe.utils.scroll_to(selector); } + } else if (window.location.hash && $(window.location.hash).length) { + frappe.utils.scroll_to(window.location.hash, true, 200, null, null, true); } } diff --git a/frappe/public/js/frappe/form/templates/timeline_message_box.html b/frappe/public/js/frappe/form/templates/timeline_message_box.html index 3884918165..a38e36c7b5 100644 --- a/frappe/public/js/frappe/form/templates/timeline_message_box.html +++ b/frappe/public/js/frappe/form/templates/timeline_message_box.html @@ -63,6 +63,20 @@ {% } %} +
    +
    + + +
    diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index f534dff1c6..33dc447890 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -268,7 +268,8 @@ Object.assign(frappe.utils, {

    '); return content.html(); }, - scroll_to: function(element, animate=true, additional_offset, element_to_be_scrolled, callback) { + scroll_to: function(element, animate=true, additional_offset, + element_to_be_scrolled, callback, highlight_element=false) { if (frappe.flags.disable_auto_scroll) return; element_to_be_scrolled = element_to_be_scrolled || $("html, body"); @@ -291,11 +292,20 @@ Object.assign(frappe.utils, { } if (animate) { - element_to_be_scrolled.animate({ scrollTop: scroll_top }).promise().then(callback); + element_to_be_scrolled.animate({ + scrollTop: scroll_top + }, null, () => { + if (highlight_element) { + $(element).addClass('highlight'); + document.addEventListener("click", function() { + $(element).removeClass('highlight'); + }, {once: true}); + } + callback && callback(); + }); } else { element_to_be_scrolled.scrollTop(scroll_top); } - }, get_scroll_position: function(element, additional_offset) { let header_offset = $(".navbar").height() + $(".page-head:visible").height(); diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index 112238bfe5..ede3dd8ba9 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -209,6 +209,8 @@ --highlight-color: var(--gray-50); --yellow-highlight-color: var(--yellow-50); + --highlight-shadow: 1px 1px 10px var(--blue-50), 0px 0px 4px var(--blue-600); + // Border Sizes --border-radius-sm: 4px; --border-radius: 6px; diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index 7f0dfe73b8..35cdffc91a 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -75,6 +75,8 @@ --highlight-color: var(--gray-700); --yellow-highlight-color: var(--yellow-700); + --highlight-shadow: 1px 1px 10px var(--blue-900), 0px 0px 4px var(--blue-500); + // input --input-disabled-bg: none; diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 8c646395e9..d157a43bc3 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -561,6 +561,19 @@ details > summary:focus { display: none; } +.highlight { + transition: 0.5s ease background-color; + box-shadow: var(--highlight-shadow) !important; +} + +.dropdown-menu.small { + font-size: var(--text-sm); + min-width: 140px; + .dropdown-item { + padding: var(--padding-xs); + } +} + // REDESIGN TODO: Handling of broken images? // img.no-image:before { // .img-background(); diff --git a/frappe/public/scss/desk/timeline.scss b/frappe/public/scss/desk/timeline.scss index a7e5d3dd9c..1861ee018b 100644 --- a/frappe/public/scss/desk/timeline.scss +++ b/frappe/public/scss/desk/timeline.scss @@ -117,7 +117,7 @@ $threshold: 34; .actions { display: flex; - > * { + > *:not(.indicator-pill) { color: var(--text-muted); } } From 59e0501cc7cd765cbefc2204df3aa4ec5bcbb94a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 8 Oct 2021 08:58:52 +0530 Subject: [PATCH 40/80] test: Fix timeline tests --- cypress/integration/timeline.js | 7 ++++--- cypress/support/commands.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index 6387485220..decde5c5de 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -43,13 +43,14 @@ context('Timeline', () => { cy.get('.timeline-content').should('contain', 'Testing Timeline 123'); //Deleting the added comment - cy.get('.actions > .btn > .icon').first().click(); + cy.get('.more-actions > .action-btn').click(); + cy.get('.more-actions .dropdown-item').contains('Delete').click(); cy.findByRole('button', {name: 'Yes'}).click(); cy.click_modal_primary_button('Yes'); //Deleting the added ToDo - cy.get('.menu-btn-group button').eq(1).click(); - cy.get('.menu-btn-group [data-label="Delete"]').click(); + cy.get('.menu-btn-group [data-original-title="Menu"]').click(); + cy.get('.menu-btn-group .dropdown-item').contains('Delete').click(); cy.findByRole('button', {name: 'Yes'}).click(); }); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 47c37a56a0..6484370946 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -353,5 +353,5 @@ Cypress.Commands.add('click_listview_primary_button', (btn_name) => { }); Cypress.Commands.add('click_timeline_action_btn', (btn_name) => { - cy.get('.timeline-content > .timeline-message-box > .justify-between > .actions > .btn').contains(btn_name).click(); + cy.get('.timeline-message-box .custom-actions > .btn').contains(btn_name).click(); }); \ No newline at end of file From 3a004d38dbfba2db7f1e8a9532c90c014d7a24d6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 8 Oct 2021 09:39:31 +0530 Subject: [PATCH 41/80] test: Fix flaky test - Due to improper cleanup one of the test of Energy Point was failing --- frappe/email/doctype/notification/test_notification.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index a086ded3fb..f05d35be3e 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -274,4 +274,7 @@ class TestNotification(unittest.TestCase): self.assertTrue('test2@example.com' in recipients) self.assertTrue('test1@example.com' in recipients) - + @classmethod + def tearDownClass(cls): + frappe.delete_doc_if_exists("Notification", "ToDo Status Update") + frappe.delete_doc_if_exists("Notification", "Contact Status Update") \ No newline at end of file From e6bbc698d07e46a8ec6455e990ec2bb001facdf4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 8 Oct 2021 11:40:31 +0530 Subject: [PATCH 42/80] ci: fail CI if asset bundling fails (#14364) * ci: fail CI if asset bundling fails * chore: formatting Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- .github/helper/install.sh | 2 +- esbuild/esbuild.js | 5 ++++- frappe/build.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 93189d2b1f..6c81d6298a 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -59,4 +59,4 @@ cd ../.. bench start & bench --site test_site reinstall --yes if [ "$TYPE" == "server" ]; then bench --site test_site_producer reinstall --yes; fi -bench build --app frappe +CI=Yes bench build --app frappe diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index 9074beae06..bf4436358e 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -104,6 +104,9 @@ async function execute() { log_error("There were some problems during build"); log(); log(chalk.dim(e.stack)); + if (process.env.CI) { + process.kill(process.pid); + } return; } @@ -528,4 +531,4 @@ function log_rebuilt_assets(prev_assets, new_assets) { log(" " + filename); } log(); -} \ No newline at end of file +} diff --git a/frappe/build.py b/frappe/build.py index 879d5ec432..05fa213018 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -246,7 +246,7 @@ def bundle(mode, apps=None, hard_link=False, make_copy=False, restore=False, ver check_node_executable() frappe_app_path = frappe.get_app_path("frappe", "..") - frappe.commands.popen(command, cwd=frappe_app_path, env=get_node_env()) + frappe.commands.popen(command, cwd=frappe_app_path, env=get_node_env(), raise_err=True) def watch(apps=None): From 7f24e10852adac4232afea489dc4d9b90c8bd104 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 8 Oct 2021 13:54:16 +0530 Subject: [PATCH 43/80] fix: Use promise to wait for all animations to complete --- frappe/public/js/frappe/utils/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 401d945b11..d79f86b084 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -294,7 +294,7 @@ Object.assign(frappe.utils, { if (animate) { element_to_be_scrolled.animate({ scrollTop: scroll_top - }, null, () => { + }).promise().then(() => { if (highlight_element) { $(element).addClass('highlight'); document.addEventListener("click", function() { From a1ddd25dff8a110c297e1210314ed089d9b35433 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 8 Oct 2021 15:36:58 +0530 Subject: [PATCH 44/80] fix: unable to delete role permissions --- frappe/core/page/permission_manager/permission_manager.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 41cc900a97..6b427fdebf 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -325,15 +325,15 @@ frappe.PermissionEngine = class PermissionEngine { .attr("data-doctype", d.parent) .attr("data-role", d.role) .attr("data-permlevel", d.permlevel) - .click(function () { + .on("click", () => { return frappe.call({ module: "frappe.core", page: "permission_manager", method: "remove", args: { - doctype: $(this).attr("data-doctype"), - role: $(this).attr("data-role"), - permlevel: $(this).attr("data-permlevel") + doctype: d.parent, + role: d.role, + permlevel: d.permlevel }, callback: (r) => { if (r.exc) { From 4f74f9e4e10b565b66b8099246005a595b67aefd Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 8 Oct 2021 15:52:44 +0530 Subject: [PATCH 45/80] fix: Add rollback to safe_exec --- frappe/utils/safe_exec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 0e5b6cc142..bc677991a7 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -155,7 +155,8 @@ def get_safe_globals(): sum = frappe.db.sum, escape = frappe.db.escape, sql = read_sql, - commit = frappe.db.commit + commit = frappe.db.commit, + rollback = frappe.db.rollback ) out.frappe.cache = cache From e245c8da09e0f99d59cbb3b71c1404ff1c6f6167 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 8 Oct 2021 18:15:12 +0530 Subject: [PATCH 46/80] fix: Don't load entire db file into memory Cleaning up my own mess :') Read and write entire SQL file line by line --- frappe/installer.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 8b840ede46..e1b67ee10c 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -456,9 +456,21 @@ def convert_archive_content(sql_file_path): if frappe.conf.db_type == "mariadb": # ever since mariaDB 10.6, row_format COMPRESSED has been deprecated and removed # this step is added to ease restoring sites depending on older mariaDB servers - contents = open(sql_file_path).read() - with open(sql_file_path, "w") as f: - f.write(contents.replace("ROW_FORMAT=COMPRESSED", "ROW_FORMAT=DYNAMIC")) + from frappe.utils import random_string + from pathlib import Path + + old_sql_file_path = Path(f"{sql_file_path}_{random_string(10)}") + sql_file_path = Path(sql_file_path) + + os.rename(sql_file_path, old_sql_file_path) + sql_file_path.unlink(missing_ok=True) + sql_file_path.touch() + + with open(old_sql_file_path) as r, open(sql_file_path, "a") as w: + for line in r: + w.write(line.replace("ROW_FORMAT=COMPRESSED", "ROW_FORMAT=DYNAMIC")) + + old_sql_file_path.unlink(missing_ok=True) def extract_sql_gzip(sql_gz_path): From 49af7784014933d7a653b98989204e15c806a1f0 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 8 Oct 2021 18:17:16 +0530 Subject: [PATCH 47/80] style: make divider lider lighter --- frappe/templates/styles/discussion_style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 44f3a649fd..593f0958c8 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -247,5 +247,6 @@ .card-divider-dark { border: 1px solid var(--gray-400); - margin-bottom: 16px; + margin-bottom: 1rem; + opacity: 0.5; } From 1127d3d18472ad92afe8a0686b42c98a346a659a Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 10 Oct 2021 17:41:26 +0530 Subject: [PATCH 48/80] fix: Restrict commit and rollback for doc events --- frappe/core/doctype/server_script/server_script.py | 11 +---------- .../core/doctype/server_script/test_server_script.py | 3 +-- frappe/utils/safe_exec.py | 6 +++++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 14f173f906..5b1aab1241 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -11,8 +11,6 @@ from frappe.model.document import Document from frappe.utils.safe_exec import get_safe_globals, safe_exec, NamespaceDict from frappe import _ -class CommitNotAllowed(frappe.ValidationError): - pass class ServerScript(Document): def validate(self): @@ -96,14 +94,7 @@ class ServerScript(Document): Args: doc (Document): Executes script with for a certain document's events """ - self.validate_script_for_doc_events() - safe_exec(self.script, _locals={"doc": doc}) - - def validate_script_for_doc_events(self): - for line in self.script.splitlines(): - line = line.strip() - if not line.startswith('#') and "frappe.db.commit()" in line: - frappe.throw(_("Commit cannot be used in DocType Event server script"), CommitNotAllowed) + safe_exec(self.script, _locals={"doc": doc}, restrict_commit_rollback=True) def execute_scheduled_method(self): """Specific to Scheduled Jobs via Server Scripts diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index a3de577ef2..de858327a9 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -5,7 +5,6 @@ import frappe import unittest import requests from frappe.utils import get_site_url -from frappe.core.doctype.server_script.server_script import CommitNotAllowed scripts = [ dict( @@ -146,7 +145,7 @@ class TestServerScript(unittest.TestCase): server_script.disabled = 0 server_script.save() - self.assertRaises(CommitNotAllowed, frappe.get_doc(dict(doctype='ToDo', description='test me')).insert) + self.assertRaises(AttributeError, frappe.get_doc(dict(doctype='ToDo', description='test me')).insert) server_script.disabled = 1 server_script.save() diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index bc677991a7..6aac8d819d 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -29,7 +29,7 @@ class NamespaceDict(frappe._dict): return ret -def safe_exec(script, _globals=None, _locals=None): +def safe_exec(script, _globals=None, _locals=None, restrict_commit_rollback=False): # server scripts can be disabled via site_config.json # they are enabled by default if 'server_script_enabled' in frappe.conf: @@ -45,6 +45,10 @@ def safe_exec(script, _globals=None, _locals=None): if _globals: exec_globals.update(_globals) + if restrict_commit_rollback: + exec_globals.frappe.db.pop('commit', None) + exec_globals.frappe.db.pop('rollback', None) + # execute script compiled by RestrictedPython exec(compile_restricted(script), exec_globals, _locals) # pylint: disable=exec-used From f9104c846f0ac90b8a45ddc98f3f20a20720f4b3 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 11 Oct 2021 12:05:53 +0530 Subject: [PATCH 49/80] fix: removed opacity and added lighter color to divider --- frappe/templates/styles/discussion_style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 593f0958c8..fc9db68aca 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -246,7 +246,6 @@ } .card-divider-dark { - border: 1px solid var(--gray-400); + border: 1px solid var(--gray-300); margin-bottom: 1rem; - opacity: 0.5; } From cfa2d653943d8a13f493c16964679f7d31e8a4e4 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 11 Oct 2021 12:28:36 +0530 Subject: [PATCH 50/80] refactor(safe_exec): Manage in-safe frappe.db.sql * Check if flag in_safe_exec to check if SELECT query in frappe.db.sql * Get rid of read_sql...refactor logic * Enable frappe.qb just like that ;) * Add support fro *args in .run --- frappe/database/database.py | 6 ++++ frappe/query_builder/builder.py | 1 + frappe/query_builder/utils.py | 4 +-- frappe/utils/safe_exec.py | 51 ++++++++++++--------------------- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 4af7252cc1..18249ac255 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -109,7 +109,13 @@ class Database(object): {"name": "a%", "owner":"test@example.com"}) """ + query = str(query) + + if frappe.flags.in_safe_exec: + if not query.strip().lower().startswith('select'): + raise frappe.PermissionError('Only SELECT SQL allowed in scripting') + if not run: return query if re.search(r'ifnull\(', query, flags=re.IGNORECASE): diff --git a/frappe/query_builder/builder.py b/frappe/query_builder/builder.py index 0c78a7e89d..5060331914 100644 --- a/frappe/query_builder/builder.py +++ b/frappe/query_builder/builder.py @@ -2,6 +2,7 @@ from pypika import MySQLQuery, Order, PostgreSQLQuery, terms from pypika.queries import Schema, Table from frappe.utils import get_table_name from pypika.terms import Function + class Base: terms = terms desc = Order.desc diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index d915b85897..ffa80637b2 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -50,8 +50,8 @@ def patch_query_execute(): executing the query object """ - def execute_query(query, **kwargs): - return frappe.db.sql(query, **kwargs) + def execute_query(query, *args, **kwargs): + return frappe.db.sql(query, *args, **kwargs) query_class = get_attr(str(frappe.qb).split("'")[1]) builder_class = get_type_hints(query_class._builder).get('return') diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 9f52d17ef4..f9d732519f 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -1,25 +1,28 @@ -import os, json, inspect +import inspect +import json import mimetypes + +import RestrictedPython.Guards from html2text import html2text from RestrictedPython import compile_restricted, safe_globals -import RestrictedPython.Guards + import frappe -from frappe import _ -import frappe.utils -import frappe.utils.data -from frappe.website.utils import (get_shade, get_toc, get_next_link) -from frappe.modules import scrub -from frappe.www.printview import get_visible_columns import frappe.exceptions import frappe.integrations.utils +import frappe.utils +import frappe.utils.data +from frappe import _ from frappe.frappeclient import FrappeClient -from frappe.query_builder.utils import get_attr -from typing import get_type_hints +from frappe.modules import scrub +from frappe.website.utils import get_next_link, get_shade, get_toc +from frappe.www.printview import get_visible_columns + class ServerScriptNotEnabled(frappe.PermissionError): pass + class NamespaceDict(frappe._dict): """Raise AttributeError if function not found in namespace""" def __getattr__(self, key): @@ -30,18 +33,6 @@ class NamespaceDict(frappe._dict): return default_function return ret -def get_safe_query_builder(): - """Allows execution of SELECT SQL queries only. - Raises: - PermissionsError raised on execution of any other SQL query - """ - query_class = get_attr(str(frappe.qb).split("'")[1]) - class SafeQB(query_class): - def __init__(self, *args, **kwargs): - _builder = get_type_hints(super()._builder).get('return') - _builder.run = read_sql - - return SafeQB() def safe_exec(script, _globals=None, _locals=None): # server scripts can be disabled via site_config.json @@ -60,13 +51,15 @@ def safe_exec(script, _globals=None, _locals=None): exec_globals.update(_globals) # execute script compiled by RestrictedPython + frappe.flags.in_safe_exec = True exec(compile_restricted(script), exec_globals, _locals) # pylint: disable=exec-used + frappe.flags.in_safe_exec = False return exec_globals, _locals def get_safe_globals(): datautils = frappe._dict() - safe_qb = get_safe_query_builder() + if frappe.db: date_format = frappe.db.get_default("date_format") or "yyyy-mm-dd" time_format = frappe.db.get_default("time_format") or "HH:mm:ss" @@ -100,7 +93,7 @@ def get_safe_globals(): bold=frappe.bold, copy_doc=frappe.copy_doc, errprint=frappe.errprint, - qb=safe_qb, + qb=frappe.qb, get_meta=frappe.get_meta, get_doc=frappe.get_doc, @@ -169,7 +162,7 @@ def get_safe_globals(): avg=frappe.db.avg, sum=frappe.db.sum, escape=frappe.db.escape, - sql=read_sql + sql=frappe.db.sql ) if frappe.response: @@ -189,14 +182,6 @@ def get_safe_globals(): return out -def read_sql(query, *args, **kwargs): - '''a wrapper for frappe.db.sql to allow reads''' - query = str(query) - if query.strip().split(None, 1)[0].lower() == 'select': - return frappe.db.sql(query, *args, **kwargs) - else: - raise frappe.PermissionError('Only SELECT SQL allowed in scripting') - def run_script(script): '''run another server script''' return frappe.get_doc('Server Script', script).execute_method() From fe7b45c068a46cb8aed95eb7233491c79b68851f Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Mon, 11 Oct 2021 14:01:17 +0530 Subject: [PATCH 51/80] fix: fixing safeqb in server scripts --- frappe/database/database.py | 4 ---- frappe/query_builder/utils.py | 2 ++ frappe/utils/safe_exec.py | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 4652109628..e98cc22f41 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -111,10 +111,6 @@ class Database(object): """ query = str(query) - - if frappe.flags.in_safe_exec and not query.strip().lower().startswith('select'): - raise frappe.PermissionError('Only SELECT SQL allowed in scripting') - if not run: return query diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index ffa80637b2..152109823d 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -51,6 +51,8 @@ def patch_query_execute(): """ def execute_query(query, *args, **kwargs): + if frappe.flags.in_safe_exec and not query.lower().strip().startswith("select"): + raise frappe.PermissionError('Only SELECT SQL allowed in scripting') return frappe.db.sql(query, *args, **kwargs) query_class = get_attr(str(frappe.qb).split("'")[1]) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index e1a70b2274..8f6b33a838 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -168,7 +168,7 @@ def get_safe_globals(): avg=frappe.db.avg, sum=frappe.db.sum, escape=frappe.db.escape, - sql=frappe.db.sql, + sql=read_sql, commit=frappe.db.commit, rollback=frappe.db.rollback, ) @@ -202,10 +202,10 @@ def cache(): def read_sql(query, *args, **kwargs): '''a wrapper for frappe.db.sql to allow reads''' - if query.strip().split(None, 1)[0].lower() == 'select': - return frappe.db.sql(query, *args, **kwargs) - else: + query = str(query) + if frappe.flags.in_safe_exec and not query.strip().lower().startswith('select'): raise frappe.PermissionError('Only SELECT SQL allowed in scripting') + return frappe.db.sql(query, *args, **kwargs) def run_script(script): '''run another server script''' From 5362d367d14cbc42f4bdcc6fc46776e520161e0a Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Mon, 11 Oct 2021 14:15:01 +0530 Subject: [PATCH 52/80] fix(minor): fixed execute_query patch --- frappe/query_builder/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index 152109823d..abd700c396 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -51,6 +51,7 @@ def patch_query_execute(): """ def execute_query(query, *args, **kwargs): + query = str(query) if frappe.flags.in_safe_exec and not query.lower().strip().startswith("select"): raise frappe.PermissionError('Only SELECT SQL allowed in scripting') return frappe.db.sql(query, *args, **kwargs) From db6fc6a5fb8ce88cc47b4aef4fd7c89d3e7fd0a6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 3 Feb 2021 17:58:19 +0530 Subject: [PATCH 53/80] feat: Hash based comparison migration --- frappe/core/doctype/doctype/doctype.json | 1364 +++++++++++----------- frappe/migrate.py | 1 + frappe/modules/import_file.py | 33 +- 3 files changed, 717 insertions(+), 681 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index 18435f8873..c85b4e8f67 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -1,680 +1,686 @@ { - "actions": [], - "allow_rename": 1, - "autoname": "Prompt", - "creation": "2013-02-18 13:36:19", - "description": "DocType is a Table / Form in the application.", - "doctype": "DocType", - "document_type": "Document", - "engine": "InnoDB", - "field_order": [ - "sb0", - "module", - "is_submittable", - "istable", - "issingle", - "is_tree", - "editable_grid", - "quick_entry", - "cb01", - "track_changes", - "track_seen", - "track_views", - "custom", - "beta", - "is_virtual", - "fields_section_break", - "fields", - "sb1", - "naming_rule", - "autoname", - "name_case", - "allow_rename", - "column_break_15", - "description", - "documentation", - "form_settings_section", - "image_field", - "timeline_field", - "nsm_parent_field", - "max_attachments", - "column_break_23", - "hide_toolbar", - "allow_copy", - "allow_import", - "allow_events_in_timeline", - "allow_auto_repeat", - "view_settings", - "title_field", - "search_fields", - "default_print_format", - "sort_field", - "sort_order", - "column_break_29", - "document_type", - "icon", - "color", - "show_preview_popup", - "show_name_in_global_search", - "email_settings_sb", - "default_email_template", - "column_break_51", - "email_append_to", - "sender_field", - "subject_field", - "sb2", - "permissions", - "restrict_to_domain", - "read_only", - "in_create", - "actions_section", - "actions", - "links_section", - "links", - "web_view", - "has_web_view", - "allow_guest_to_view", - "index_web_pages_for_search", - "route", - "is_published_field", - "website_search_field", - "advanced", - "engine" - ], - "fields": [ - { - "fieldname": "sb0", - "fieldtype": "Section Break", - "oldfieldtype": "Section Break" - }, - { - "fieldname": "module", - "fieldtype": "Link", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Module", - "oldfieldname": "module", - "oldfieldtype": "Link", - "options": "Module Def", - "reqd": 1, - "search_index": 1 - }, - { - "default": "0", - "depends_on": "eval:!doc.istable", - "description": "Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended.", - "fieldname": "is_submittable", - "fieldtype": "Check", - "label": "Is Submittable" - }, - { - "default": "0", - "description": "Child Tables are shown as a Grid in other DocTypes", - "fieldname": "istable", - "fieldtype": "Check", - "in_standard_filter": 1, - "label": "Is Child Table", - "oldfieldname": "istable", - "oldfieldtype": "Check" - }, - { - "default": "0", - "depends_on": "eval:!doc.istable", - "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", - "fieldname": "issingle", - "fieldtype": "Check", - "in_standard_filter": 1, - "label": "Is Single", - "oldfieldname": "issingle", - "oldfieldtype": "Check", - "set_only_once": 1 - }, - { - "default": "1", - "depends_on": "istable", - "fieldname": "editable_grid", - "fieldtype": "Check", - "label": "Editable Grid" - }, - { - "default": "0", - "depends_on": "eval:!doc.istable && !doc.issingle", - "description": "Open a dialog with mandatory fields to create a new record quickly", - "fieldname": "quick_entry", - "fieldtype": "Check", - "label": "Quick Entry" - }, - { - "fieldname": "cb01", - "fieldtype": "Column Break" - }, - { - "default": "1", - "depends_on": "eval:!doc.istable", - "description": "If enabled, changes to the document are tracked and shown in timeline", - "fieldname": "track_changes", - "fieldtype": "Check", - "label": "Track Changes" - }, - { - "default": "0", - "depends_on": "eval:!doc.istable", - "description": "If enabled, the document is marked as seen, the first time a user opens it", - "fieldname": "track_seen", - "fieldtype": "Check", - "label": "Track Seen" - }, - { - "default": "0", - "depends_on": "eval:!doc.istable", - "description": "If enabled, document views are tracked, this can happen multiple times", - "fieldname": "track_views", - "fieldtype": "Check", - "label": "Track Views" - }, - { - "default": "0", - "fieldname": "custom", - "fieldtype": "Check", - "label": "Custom?" - }, - { - "default": "0", - "fieldname": "beta", - "fieldtype": "Check", - "label": "Beta" - }, - { - "fieldname": "fields_section_break", - "fieldtype": "Section Break", - "label": "Fields", - "oldfieldtype": "Section Break" - }, - { - "fieldname": "fields", - "fieldtype": "Table", - "label": "Fields", - "oldfieldname": "fields", - "oldfieldtype": "Table", - "options": "DocField" - }, - { - "fieldname": "sb1", - "fieldtype": "Section Break", - "label": "Naming" - }, - { - "description": "Naming Options:\n
    1. field:[fieldname] - By Field
    2. naming_series: - By Naming Series (field called naming_series must be present
    3. Prompt - Prompt user for a name
    4. [series] - Series by prefix (separated by a dot); for example PRE.#####
      5. \n
    5. format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
    ", - "fieldname": "autoname", - "fieldtype": "Data", - "label": "Auto Name", - "oldfieldname": "autoname", - "oldfieldtype": "Data" - }, - { - "fieldname": "name_case", - "fieldtype": "Select", - "label": "Name Case", - "oldfieldname": "name_case", - "oldfieldtype": "Select", - "options": "\nTitle Case\nUPPER CASE" - }, - { - "fieldname": "column_break_15", - "fieldtype": "Column Break" - }, - { - "fieldname": "description", - "fieldtype": "Small Text", - "label": "Description", - "oldfieldname": "description", - "oldfieldtype": "Text" - }, - { - "collapsible": 1, - "fieldname": "form_settings_section", - "fieldtype": "Section Break", - "label": "Form Settings" - }, - { - "description": "Must be of type \"Attach Image\"", - "fieldname": "image_field", - "fieldtype": "Data", - "label": "Image Field" - }, - { - "depends_on": "eval:!doc.istable", - "description": "Comments and Communications will be associated with this linked document", - "fieldname": "timeline_field", - "fieldtype": "Data", - "label": "Timeline Field" - }, - { - "fieldname": "max_attachments", - "fieldtype": "Int", - "label": "Max Attachments", - "oldfieldname": "max_attachments", - "oldfieldtype": "Int" - }, - { - "fieldname": "column_break_23", - "fieldtype": "Column Break" - }, - { - "default": "0", - "fieldname": "hide_toolbar", - "fieldtype": "Check", - "label": "Hide Sidebar and Menu", - "oldfieldname": "hide_toolbar", - "oldfieldtype": "Check" - }, - { - "default": "0", - "fieldname": "allow_copy", - "fieldtype": "Check", - "label": "Hide Copy", - "oldfieldname": "allow_copy", - "oldfieldtype": "Check" - }, - { - "default": "1", - "fieldname": "allow_rename", - "fieldtype": "Check", - "label": "Allow Rename", - "oldfieldname": "allow_rename", - "oldfieldtype": "Check" - }, - { - "default": "0", - "fieldname": "allow_import", - "fieldtype": "Check", - "label": "Allow Import (via Data Import Tool)" - }, - { - "default": "0", - "fieldname": "allow_events_in_timeline", - "fieldtype": "Check", - "label": "Allow events in timeline" - }, - { - "default": "0", - "fieldname": "allow_auto_repeat", - "fieldtype": "Check", - "label": "Allow Auto Repeat" - }, - { - "collapsible": 1, - "fieldname": "view_settings", - "fieldtype": "Section Break", - "label": "View Settings" - }, - { - "depends_on": "eval:!doc.istable", - "fieldname": "title_field", - "fieldtype": "Data", - "label": "Title Field" - }, - { - "depends_on": "eval:!doc.istable", - "fieldname": "search_fields", - "fieldtype": "Data", - "label": "Search Fields", - "oldfieldname": "search_fields", - "oldfieldtype": "Data" - }, - { - "fieldname": "default_print_format", - "fieldtype": "Data", - "label": "Default Print Format" - }, - { - "default": "modified", - "depends_on": "eval:!doc.istable", - "fieldname": "sort_field", - "fieldtype": "Data", - "label": "Default Sort Field" - }, - { - "default": "DESC", - "depends_on": "eval:!doc.istable", - "fieldname": "sort_order", - "fieldtype": "Select", - "label": "Default Sort Order", - "options": "ASC\nDESC" - }, - { - "fieldname": "column_break_29", - "fieldtype": "Column Break" - }, - { - "fieldname": "document_type", - "fieldtype": "Select", - "label": "Show in Module Section", - "oldfieldname": "document_type", - "oldfieldtype": "Select", - "options": "\nDocument\nSetup\nSystem\nOther" - }, - { - "fieldname": "icon", - "fieldtype": "Data", - "label": "Icon" - }, - { - "fieldname": "color", - "fieldtype": "Data", - "label": "Color" - }, - { - "default": "0", - "fieldname": "show_preview_popup", - "fieldtype": "Check", - "label": "Show Preview Popup" - }, - { - "default": "0", - "fieldname": "show_name_in_global_search", - "fieldtype": "Check", - "label": "Make \"name\" searchable in Global Search" - }, - { - "depends_on": "eval:!doc.istable", - "fieldname": "sb2", - "fieldtype": "Section Break", - "label": "Permission Rules" - }, - { - "fieldname": "permissions", - "fieldtype": "Table", - "label": "Permissions", - "oldfieldname": "permissions", - "oldfieldtype": "Table", - "options": "DocPerm" - }, - { - "fieldname": "restrict_to_domain", - "fieldtype": "Link", - "label": "Restrict To Domain", - "options": "Domain" - }, - { - "default": "0", - "fieldname": "read_only", - "fieldtype": "Check", - "label": "User Cannot Search", - "oldfieldname": "read_only", - "oldfieldtype": "Check" - }, - { - "default": "0", - "fieldname": "in_create", - "fieldtype": "Check", - "label": "User Cannot Create", - "oldfieldname": "in_create", - "oldfieldtype": "Check" - }, - { - "depends_on": "eval:doc.custom===0", - "fieldname": "web_view", - "fieldtype": "Section Break", - "label": "Web View" - }, - { - "default": "0", - "fieldname": "has_web_view", - "fieldtype": "Check", - "label": "Has Web View" - }, - { - "default": "0", - "depends_on": "has_web_view", - "fieldname": "allow_guest_to_view", - "fieldtype": "Check", - "label": "Allow Guest to View" - }, - { - "depends_on": "eval:!doc.istable", - "fieldname": "route", - "fieldtype": "Data", - "label": "Route" - }, - { - "depends_on": "has_web_view", - "fieldname": "is_published_field", - "fieldtype": "Data", - "label": "Is Published Field" - }, - { - "collapsible": 1, - "fieldname": "advanced", - "fieldtype": "Section Break", - "hidden": 1, - "label": "Advanced" - }, - { - "default": "InnoDB", - "depends_on": "eval:!doc.issingle", - "fieldname": "engine", - "fieldtype": "Select", - "label": "Database Engine", - "options": "InnoDB\nMyISAM" - }, - { - "default": "0", - "description": "Tree structures are implemented using Nested Set", - "fieldname": "is_tree", - "fieldtype": "Check", - "label": "Is Tree" - }, - { - "depends_on": "is_tree", - "fieldname": "nsm_parent_field", - "fieldtype": "Data", - "label": "Parent Field (Tree)" - }, - { - "description": "URL for documentation or help", - "fieldname": "documentation", - "fieldtype": "Data", - "label": "Documentation Link" - }, - { - "collapsible": 1, - "collapsible_depends_on": "actions", - "fieldname": "actions_section", - "fieldtype": "Section Break", - "label": "Actions" - }, - { - "fieldname": "actions", - "fieldtype": "Table", - "label": "Actions", - "options": "DocType Action" - }, - { - "collapsible": 1, - "collapsible_depends_on": "links", - "fieldname": "links_section", - "fieldtype": "Section Break", - "label": "Linked Documents" - }, - { - "fieldname": "links", - "fieldtype": "Table", - "label": "Links", - "options": "DocType Link" - }, - { - "depends_on": "email_append_to", - "fieldname": "subject_field", - "fieldtype": "Data", - "label": "Subject Field" - }, - { - "depends_on": "email_append_to", - "fieldname": "sender_field", - "fieldtype": "Data", - "label": "Sender Field", - "mandatory_depends_on": "email_append_to" - }, - { - "default": "0", - "fieldname": "email_append_to", - "fieldtype": "Check", - "label": "Allow document creation via Email" - }, - { - "collapsible": 1, - "fieldname": "email_settings_sb", - "fieldtype": "Section Break", - "label": "Email Settings" - }, - { - "default": "1", - "fieldname": "index_web_pages_for_search", - "fieldtype": "Check", - "label": "Index Web Pages for Search" - }, - { - "default": "0", - "fieldname": "is_virtual", - "fieldtype": "Check", - "label": "Is Virtual" - }, - { - "fieldname": "default_email_template", - "fieldtype": "Link", - "label": "Default Email Template", - "options": "Email Template" - }, - { - "fieldname": "column_break_51", - "fieldtype": "Column Break" - }, - { - "depends_on": "has_web_view", - "fieldname": "website_search_field", - "fieldtype": "Data", - "label": "Website Search Field" - }, - { - "fieldname": "naming_rule", - "fieldtype": "Select", - "label": "Naming Rule", - "length": 40, - "options": "\nSet by user\nBy fieldname\nBy \"Naming Series\" field\nExpression\nExpression (old style)\nRandom\nBy script" - } - ], - "icon": "fa fa-bolt", - "idx": 6, - "links": [ - { - "group": "Views", - "link_doctype": "Report", - "link_fieldname": "ref_doctype" - }, - { - "group": "Workflow", - "link_doctype": "Workflow", - "link_fieldname": "document_type" - }, - { - "group": "Workflow", - "link_doctype": "Notification", - "link_fieldname": "document_type" - }, - { - "group": "Customization", - "link_doctype": "Custom Field", - "link_fieldname": "dt" - }, - { - "group": "Customization", - "link_doctype": "Client Script", - "link_fieldname": "dt" - }, - { - "group": "Customization", - "link_doctype": "Server Script", - "link_fieldname": "reference_doctype" - }, - { - "group": "Workflow", - "link_doctype": "Webhook", - "link_fieldname": "webhook_doctype" - }, - { - "group": "Views", - "link_doctype": "Print Format", - "link_fieldname": "doc_type" - }, - { - "group": "Views", - "link_doctype": "Web Form", - "link_fieldname": "doc_type" - }, - { - "group": "Views", - "link_doctype": "Calendar View", - "link_fieldname": "reference_doctype" - }, - { - "group": "Views", - "link_doctype": "Kanban Board", - "link_fieldname": "reference_doctype" - }, - { - "group": "Workflow", - "link_doctype": "Onboarding Step", - "link_fieldname": "reference_document" - }, - { - "group": "Rules", - "link_doctype": "Auto Repeat", - "link_fieldname": "reference_doctype" - }, - { - "group": "Rules", - "link_doctype": "Assignment Rule", - "link_fieldname": "document_type" - }, - { - "group": "Rules", - "link_doctype": "Energy Point Rule", - "link_fieldname": "reference_doctype" - } - ], - "modified": "2021-09-05 15:39:13.233403", - "modified_by": "Administrator", - "module": "Core", - "name": "DocType", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "share": 1, - "write": 1 - } - ], - "route": "doctype", - "search_fields": "module", - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file + "actions": [], + "allow_rename": 1, + "autoname": "Prompt", + "creation": "2013-02-18 13:36:19", + "description": "DocType is a Table / Form in the application.", + "doctype": "DocType", + "document_type": "Document", + "engine": "InnoDB", + "field_order": [ + "sb0", + "module", + "is_submittable", + "istable", + "issingle", + "is_tree", + "editable_grid", + "quick_entry", + "cb01", + "track_changes", + "track_seen", + "track_views", + "custom", + "beta", + "is_virtual", + "fields_section_break", + "fields", + "sb1", + "naming_rule", + "autoname", + "name_case", + "allow_rename", + "column_break_15", + "description", + "documentation", + "form_settings_section", + "image_field", + "timeline_field", + "nsm_parent_field", + "max_attachments", + "column_break_23", + "hide_toolbar", + "allow_copy", + "allow_import", + "allow_events_in_timeline", + "allow_auto_repeat", + "view_settings", + "title_field", + "search_fields", + "default_print_format", + "sort_field", + "sort_order", + "column_break_29", + "document_type", + "icon", + "color", + "show_preview_popup", + "show_name_in_global_search", + "email_settings_sb", + "default_email_template", + "column_break_51", + "email_append_to", + "sender_field", + "subject_field", + "sb2", + "permissions", + "restrict_to_domain", + "read_only", + "in_create", + "actions_section", + "actions", + "links_section", + "links", + "web_view", + "has_web_view", + "allow_guest_to_view", + "index_web_pages_for_search", + "route", + "is_published_field", + "website_search_field", + "advanced", + "engine", + "migration_hash" + ], + "fields": [ + { + "fieldname": "sb0", + "fieldtype": "Section Break", + "oldfieldtype": "Section Break" + }, + { + "fieldname": "module", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Module", + "oldfieldname": "module", + "oldfieldtype": "Link", + "options": "Module Def", + "reqd": 1, + "search_index": 1 + }, + { + "default": "0", + "depends_on": "eval:!doc.istable", + "description": "Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended.", + "fieldname": "is_submittable", + "fieldtype": "Check", + "label": "Is Submittable" + }, + { + "default": "0", + "description": "Child Tables are shown as a Grid in other DocTypes", + "fieldname": "istable", + "fieldtype": "Check", + "in_standard_filter": 1, + "label": "Is Child Table", + "oldfieldname": "istable", + "oldfieldtype": "Check" + }, + { + "default": "0", + "depends_on": "eval:!doc.istable", + "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", + "fieldname": "issingle", + "fieldtype": "Check", + "in_standard_filter": 1, + "label": "Is Single", + "oldfieldname": "issingle", + "oldfieldtype": "Check", + "set_only_once": 1 + }, + { + "default": "1", + "depends_on": "istable", + "fieldname": "editable_grid", + "fieldtype": "Check", + "label": "Editable Grid" + }, + { + "default": "0", + "depends_on": "eval:!doc.istable && !doc.issingle", + "description": "Open a dialog with mandatory fields to create a new record quickly", + "fieldname": "quick_entry", + "fieldtype": "Check", + "label": "Quick Entry" + }, + { + "fieldname": "cb01", + "fieldtype": "Column Break" + }, + { + "default": "1", + "depends_on": "eval:!doc.istable", + "description": "If enabled, changes to the document are tracked and shown in timeline", + "fieldname": "track_changes", + "fieldtype": "Check", + "label": "Track Changes" + }, + { + "default": "0", + "depends_on": "eval:!doc.istable", + "description": "If enabled, the document is marked as seen, the first time a user opens it", + "fieldname": "track_seen", + "fieldtype": "Check", + "label": "Track Seen" + }, + { + "default": "0", + "depends_on": "eval:!doc.istable", + "description": "If enabled, document views are tracked, this can happen multiple times", + "fieldname": "track_views", + "fieldtype": "Check", + "label": "Track Views" + }, + { + "default": "0", + "fieldname": "custom", + "fieldtype": "Check", + "label": "Custom?" + }, + { + "default": "0", + "fieldname": "beta", + "fieldtype": "Check", + "label": "Beta" + }, + { + "fieldname": "fields_section_break", + "fieldtype": "Section Break", + "label": "Fields", + "oldfieldtype": "Section Break" + }, + { + "fieldname": "fields", + "fieldtype": "Table", + "label": "Fields", + "oldfieldname": "fields", + "oldfieldtype": "Table", + "options": "DocField" + }, + { + "fieldname": "sb1", + "fieldtype": "Section Break", + "label": "Naming" + }, + { + "description": "Naming Options:\n
    1. field:[fieldname] - By Field
    2. naming_series: - By Naming Series (field called naming_series must be present
    3. Prompt - Prompt user for a name
    4. [series] - Series by prefix (separated by a dot); for example PRE.#####
      5. \n
    5. format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
    ", + "fieldname": "autoname", + "fieldtype": "Data", + "label": "Auto Name", + "oldfieldname": "autoname", + "oldfieldtype": "Data" + }, + { + "fieldname": "name_case", + "fieldtype": "Select", + "label": "Name Case", + "oldfieldname": "name_case", + "oldfieldtype": "Select", + "options": "\nTitle Case\nUPPER CASE" + }, + { + "fieldname": "column_break_15", + "fieldtype": "Column Break" + }, + { + "fieldname": "description", + "fieldtype": "Small Text", + "label": "Description", + "oldfieldname": "description", + "oldfieldtype": "Text" + }, + { + "collapsible": 1, + "fieldname": "form_settings_section", + "fieldtype": "Section Break", + "label": "Form Settings" + }, + { + "description": "Must be of type \"Attach Image\"", + "fieldname": "image_field", + "fieldtype": "Data", + "label": "Image Field" + }, + { + "depends_on": "eval:!doc.istable", + "description": "Comments and Communications will be associated with this linked document", + "fieldname": "timeline_field", + "fieldtype": "Data", + "label": "Timeline Field" + }, + { + "fieldname": "max_attachments", + "fieldtype": "Int", + "label": "Max Attachments", + "oldfieldname": "max_attachments", + "oldfieldtype": "Int" + }, + { + "fieldname": "column_break_23", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "hide_toolbar", + "fieldtype": "Check", + "label": "Hide Sidebar and Menu", + "oldfieldname": "hide_toolbar", + "oldfieldtype": "Check" + }, + { + "default": "0", + "fieldname": "allow_copy", + "fieldtype": "Check", + "label": "Hide Copy", + "oldfieldname": "allow_copy", + "oldfieldtype": "Check" + }, + { + "default": "1", + "fieldname": "allow_rename", + "fieldtype": "Check", + "label": "Allow Rename", + "oldfieldname": "allow_rename", + "oldfieldtype": "Check" + }, + { + "default": "0", + "fieldname": "allow_import", + "fieldtype": "Check", + "label": "Allow Import (via Data Import Tool)" + }, + { + "default": "0", + "fieldname": "allow_events_in_timeline", + "fieldtype": "Check", + "label": "Allow events in timeline" + }, + { + "default": "0", + "fieldname": "allow_auto_repeat", + "fieldtype": "Check", + "label": "Allow Auto Repeat" + }, + { + "collapsible": 1, + "fieldname": "view_settings", + "fieldtype": "Section Break", + "label": "View Settings" + }, + { + "depends_on": "eval:!doc.istable", + "fieldname": "title_field", + "fieldtype": "Data", + "label": "Title Field" + }, + { + "depends_on": "eval:!doc.istable", + "fieldname": "search_fields", + "fieldtype": "Data", + "label": "Search Fields", + "oldfieldname": "search_fields", + "oldfieldtype": "Data" + }, + { + "fieldname": "default_print_format", + "fieldtype": "Data", + "label": "Default Print Format" + }, + { + "default": "modified", + "depends_on": "eval:!doc.istable", + "fieldname": "sort_field", + "fieldtype": "Data", + "label": "Default Sort Field" + }, + { + "default": "DESC", + "depends_on": "eval:!doc.istable", + "fieldname": "sort_order", + "fieldtype": "Select", + "label": "Default Sort Order", + "options": "ASC\nDESC" + }, + { + "fieldname": "column_break_29", + "fieldtype": "Column Break" + }, + { + "fieldname": "document_type", + "fieldtype": "Select", + "label": "Show in Module Section", + "oldfieldname": "document_type", + "oldfieldtype": "Select", + "options": "\nDocument\nSetup\nSystem\nOther" + }, + { + "fieldname": "icon", + "fieldtype": "Data", + "label": "Icon" + }, + { + "fieldname": "color", + "fieldtype": "Data", + "label": "Color" + }, + { + "default": "0", + "fieldname": "show_preview_popup", + "fieldtype": "Check", + "label": "Show Preview Popup" + }, + { + "default": "0", + "fieldname": "show_name_in_global_search", + "fieldtype": "Check", + "label": "Make \"name\" searchable in Global Search" + }, + { + "depends_on": "eval:!doc.istable", + "fieldname": "sb2", + "fieldtype": "Section Break", + "label": "Permission Rules" + }, + { + "fieldname": "permissions", + "fieldtype": "Table", + "label": "Permissions", + "oldfieldname": "permissions", + "oldfieldtype": "Table", + "options": "DocPerm" + }, + { + "fieldname": "restrict_to_domain", + "fieldtype": "Link", + "label": "Restrict To Domain", + "options": "Domain" + }, + { + "default": "0", + "fieldname": "read_only", + "fieldtype": "Check", + "label": "User Cannot Search", + "oldfieldname": "read_only", + "oldfieldtype": "Check" + }, + { + "default": "0", + "fieldname": "in_create", + "fieldtype": "Check", + "label": "User Cannot Create", + "oldfieldname": "in_create", + "oldfieldtype": "Check" + }, + { + "depends_on": "eval:doc.custom===0", + "fieldname": "web_view", + "fieldtype": "Section Break", + "label": "Web View" + }, + { + "default": "0", + "fieldname": "has_web_view", + "fieldtype": "Check", + "label": "Has Web View" + }, + { + "default": "0", + "depends_on": "has_web_view", + "fieldname": "allow_guest_to_view", + "fieldtype": "Check", + "label": "Allow Guest to View" + }, + { + "depends_on": "eval:!doc.istable", + "fieldname": "route", + "fieldtype": "Data", + "label": "Route" + }, + { + "depends_on": "has_web_view", + "fieldname": "is_published_field", + "fieldtype": "Data", + "label": "Is Published Field" + }, + { + "collapsible": 1, + "fieldname": "advanced", + "fieldtype": "Section Break", + "hidden": 1, + "label": "Advanced" + }, + { + "default": "InnoDB", + "depends_on": "eval:!doc.issingle", + "fieldname": "engine", + "fieldtype": "Select", + "label": "Database Engine", + "options": "InnoDB\nMyISAM" + }, + { + "default": "0", + "description": "Tree structures are implemented using Nested Set", + "fieldname": "is_tree", + "fieldtype": "Check", + "label": "Is Tree" + }, + { + "depends_on": "is_tree", + "fieldname": "nsm_parent_field", + "fieldtype": "Data", + "label": "Parent Field (Tree)" + }, + { + "description": "URL for documentation or help", + "fieldname": "documentation", + "fieldtype": "Data", + "label": "Documentation Link" + }, + { + "collapsible": 1, + "collapsible_depends_on": "actions", + "fieldname": "actions_section", + "fieldtype": "Section Break", + "label": "Actions" + }, + { + "fieldname": "actions", + "fieldtype": "Table", + "label": "Actions", + "options": "DocType Action" + }, + { + "collapsible": 1, + "collapsible_depends_on": "links", + "fieldname": "links_section", + "fieldtype": "Section Break", + "label": "Linked Documents" + }, + { + "fieldname": "links", + "fieldtype": "Table", + "label": "Links", + "options": "DocType Link" + }, + { + "depends_on": "email_append_to", + "fieldname": "subject_field", + "fieldtype": "Data", + "label": "Subject Field" + }, + { + "depends_on": "email_append_to", + "fieldname": "sender_field", + "fieldtype": "Data", + "label": "Sender Field", + "mandatory_depends_on": "email_append_to" + }, + { + "default": "0", + "fieldname": "email_append_to", + "fieldtype": "Check", + "label": "Allow document creation via Email" + }, + { + "collapsible": 1, + "fieldname": "email_settings_sb", + "fieldtype": "Section Break", + "label": "Email Settings" + }, + { + "default": "1", + "fieldname": "index_web_pages_for_search", + "fieldtype": "Check", + "label": "Index Web Pages for Search" + }, + { + "default": "0", + "fieldname": "is_virtual", + "fieldtype": "Check", + "label": "Is Virtual" + }, + { + "fieldname": "default_email_template", + "fieldtype": "Link", + "label": "Default Email Template", + "options": "Email Template" + }, + { + "fieldname": "column_break_51", + "fieldtype": "Column Break" + }, + { + "depends_on": "has_web_view", + "fieldname": "website_search_field", + "fieldtype": "Data", + "label": "Website Search Field" + }, + { + "fieldname": "naming_rule", + "fieldtype": "Select", + "label": "Naming Rule", + "length": 40, + "options": "\nSet by user\nBy fieldname\nBy \"Naming Series\" field\nExpression\nExpression (old style)\nRandom\nBy script" + }, + { + "fieldname": "migration_hash", + "fieldtype": "Data", + "hidden": 1 + } + ], + "icon": "fa fa-bolt", + "idx": 6, + "links": [ + { + "group": "Views", + "link_doctype": "Report", + "link_fieldname": "ref_doctype" + }, + { + "group": "Workflow", + "link_doctype": "Workflow", + "link_fieldname": "document_type" + }, + { + "group": "Workflow", + "link_doctype": "Notification", + "link_fieldname": "document_type" + }, + { + "group": "Customization", + "link_doctype": "Custom Field", + "link_fieldname": "dt" + }, + { + "group": "Customization", + "link_doctype": "Client Script", + "link_fieldname": "dt" + }, + { + "group": "Customization", + "link_doctype": "Server Script", + "link_fieldname": "reference_doctype" + }, + { + "group": "Workflow", + "link_doctype": "Webhook", + "link_fieldname": "webhook_doctype" + }, + { + "group": "Views", + "link_doctype": "Print Format", + "link_fieldname": "doc_type" + }, + { + "group": "Views", + "link_doctype": "Web Form", + "link_fieldname": "doc_type" + }, + { + "group": "Views", + "link_doctype": "Calendar View", + "link_fieldname": "reference_doctype" + }, + { + "group": "Views", + "link_doctype": "Kanban Board", + "link_fieldname": "reference_doctype" + }, + { + "group": "Workflow", + "link_doctype": "Onboarding Step", + "link_fieldname": "reference_document" + }, + { + "group": "Rules", + "link_doctype": "Auto Repeat", + "link_fieldname": "reference_doctype" + }, + { + "group": "Rules", + "link_doctype": "Assignment Rule", + "link_fieldname": "document_type" + }, + { + "group": "Rules", + "link_doctype": "Energy Point Rule", + "link_fieldname": "reference_doctype" + } + ], + "modified": "2021-09-05 15:39:13.233403", + "modified_by": "Administrator", + "module": "Core", + "name": "DocType", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "share": 1, + "write": 1 + } + ], + "route": "doctype", + "search_fields": "module", + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} diff --git a/frappe/migrate.py b/frappe/migrate.py index 92258502e4..a9c609e461 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -51,6 +51,7 @@ Otherwise, check the server logs and ensure that all the required services are r os.remove(touched_tables_file) try: + frappe.reload_doctype("DocType", force=True) frappe.flags.touched_tables = set() frappe.flags.in_migrate = True diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index e7a1f5f97c..83d789939d 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -5,6 +5,16 @@ from frappe.modules import get_module_path, scrub_dt_dn from frappe.utils import get_datetime_str from frappe.model.base_document import get_controller +import hashlib + +def md5(fname): + hash_md5 = hashlib.md5() + with open(fname, "rb") as f: + for chunk in iter(lambda: f.read(4096), b""): + hash_md5.update(chunk) + return hash_md5.hexdigest() + + ignore_values = { "Report": ["disabled", "prepared_report", "add_total_row"], "Print Format": ["disabled"], @@ -43,25 +53,44 @@ def get_file_path(module, dt, dn): def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, for_sync=False): + if not frappe.flags.dt: + frappe.flags.dt = [] try: docs = read_doc_from_file(path) except IOError: print (path + " missing") return + curr_hash = md5(path) + if docs: if not isinstance(docs, list): docs = [docs] for doc in docs: - if not force and not is_changed(doc): - return False + if not force: + try: + db_hash = frappe.db.get_value(doc['doctype'], doc['name'], 'migration_hash') + except: + frappe.flags.dt += [doc['doctype']] + db_hash = None + + if not db_hash: + db_modified = frappe.db.get_value(doc['doctype'], doc['name'], 'modified') + if db_modified and doc.get('modified') == get_datetime_str(db_modified): + return False + + if curr_hash == db_hash: + return False original_modified = doc.get("modified") import_doc(doc, force=force, data_import=data_import, pre_process=pre_process, ignore_version=ignore_version, reset_permissions=reset_permissions, path=path) + if doc['doctype'] == "DocType": + frappe.db.set_value(doc['doctype'], doc['name'], 'migration_hash', curr_hash) + if original_modified: update_modified(original_modified, doc) From c3be3d35e8a0b9a85fc4e6e77131de2f68c6dc07 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 3 Feb 2021 18:01:35 +0530 Subject: [PATCH 54/80] fix: "function"al programming++ --- frappe/model/sync.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 138f9eaad4..7ce9dba245 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -59,9 +59,10 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe for module_name in frappe.local.app_modules.get(app_name) or []: folder = os.path.dirname(frappe.get_module(app_name + "." + module_name).__file__) - get_doc_files(files, folder) + files = get_doc_files(files, folder, force, sync_everything, verbose=verbose) l = len(files) + if l: for i, doc_path in enumerate(files): import_file_by_path(doc_path, force=force, ignore_version=True, @@ -78,6 +79,9 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe def get_doc_files(files, start_path): """walk and sync all doctypes and pages""" + if not files: + files = [] + # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'web_page', 'website_theme', 'web_form', 'web_template', @@ -95,3 +99,5 @@ def get_doc_files(files, start_path): if os.path.exists(doc_path): if not doc_path in files: files.append(doc_path) + + return files \ No newline at end of file From b2b391e90ae7fa82b4b0ff5a3eab8f2b9c6ba007 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 17 Sep 2021 14:49:51 +0530 Subject: [PATCH 55/80] style: misc --- frappe/model/sync.py | 3 +- frappe/modules/import_file.py | 82 +++++++++++-------- ..._user_permission_doctype_before_migrate.py | 4 +- 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 7ce9dba245..70afd79723 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -79,8 +79,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe def get_doc_files(files, start_path): """walk and sync all doctypes and pages""" - if not files: - files = [] + files = files or [] # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 83d789939d..7c3ebfddb3 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -7,6 +7,7 @@ from frappe.model.base_document import get_controller import hashlib + def md5(fname): hash_md5 = hashlib.md5() with open(fname, "rb") as f: @@ -20,22 +21,24 @@ ignore_values = { "Print Format": ["disabled"], "Notification": ["enabled"], "Print Style": ["disabled"], - "Module Onboarding": ['is_complete'], - "Onboarding Step": ['is_complete', 'is_skipped'] + "Module Onboarding": ["is_complete"], + "Onboarding Step": ["is_complete", "is_skipped"], } ignore_doctypes = [""] + def import_files(module, dt=None, dn=None, force=False, pre_process=None, reset_permissions=False): if type(module) is list: out = [] for m in module: - out.append(import_file(m[0], m[1], m[2], force=force, pre_process=pre_process, - reset_permissions=reset_permissions)) + out.append( + import_file(m[0], m[1], m[2], force=force, pre_process=pre_process, reset_permissions=reset_permissions) + ) return out else: - return import_file(module, dt, dn, force=force, pre_process=pre_process, - reset_permissions=reset_permissions) + return import_file(module, dt, dn, force=force, pre_process=pre_process, reset_permissions=reset_permissions) + def import_file(module, dt, dn, force=False, pre_process=None, reset_permissions=False): """Sync a file from txt if modifed, return false if not updated""" @@ -43,22 +46,21 @@ def import_file(module, dt, dn, force=False, pre_process=None, reset_permissions ret = import_file_by_path(path, force, pre_process=pre_process, reset_permissions=reset_permissions) return ret + def get_file_path(module, dt, dn): dt, dn = scrub_dt_dn(dt, dn) - path = os.path.join(get_module_path(module), - os.path.join(dt, dn, dn + ".json")) + path = os.path.join(get_module_path(module), os.path.join(dt, dn, f"{dn}.json")) return path def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, for_sync=False): - if not frappe.flags.dt: - frappe.flags.dt = [] + frappe.flags.dt = frappe.flags.dt or [] try: docs = read_doc_from_file(path) except IOError: - print (path + " missing") + print(f"{path} missing") return curr_hash = md5(path) @@ -70,58 +72,68 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, for doc in docs: if not force: try: - db_hash = frappe.db.get_value(doc['doctype'], doc['name'], 'migration_hash') + db_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") except: - frappe.flags.dt += [doc['doctype']] + frappe.flags.dt += [doc["doctype"]] db_hash = None if not db_hash: - db_modified = frappe.db.get_value(doc['doctype'], doc['name'], 'modified') - if db_modified and doc.get('modified') == get_datetime_str(db_modified): + db_modified = frappe.db.get_value(doc["doctype"], doc["name"], "modified") + if db_modified and doc.get("modified") == get_datetime_str(db_modified): return False - if curr_hash == db_hash: return False original_modified = doc.get("modified") - import_doc(doc, force=force, data_import=data_import, pre_process=pre_process, - ignore_version=ignore_version, reset_permissions=reset_permissions, path=path) + import_doc( + docdict=doc, + force=force, + data_import=data_import, + pre_process=pre_process, + ignore_version=ignore_version, + reset_permissions=reset_permissions, + path=path, + ) - if doc['doctype'] == "DocType": - frappe.db.set_value(doc['doctype'], doc['name'], 'migration_hash', curr_hash) + if doc["doctype"] == "DocType": + frappe.db.set_value(doc["doctype"], doc["name"], "migration_hash", curr_hash) if original_modified: update_modified(original_modified, doc) return True + def is_changed(doc): # check if timestamps match - db_modified = frappe.db.get_value(doc['doctype'], doc['name'], 'modified') - if db_modified and doc.get('modified')==get_datetime_str(db_modified): + db_modified = frappe.db.get_value(doc["doctype"], doc["name"], "modified") + if db_modified and doc.get("modified") == get_datetime_str(db_modified): return False return True + def read_doc_from_file(path): doc = None if os.path.exists(path): - with open(path, 'r') as f: + with open(path, "r") as f: try: doc = json.loads(f.read()) except ValueError: print("bad json: {0}".format(path)) raise else: - raise IOError('%s missing' % path) + raise IOError("%s missing" % path) return doc + def update_modified(original_modified, doc): # since there is a new timestamp on the file, update timestamp in - if doc["doctype"] == doc["name"] and doc["name"]!="DocType": - frappe.db.sql("""update tabSingles set value=%s where field="modified" and doctype=%s""", - (original_modified, doc["name"])) + if doc["doctype"] == doc["name"] and doc["name"] != "DocType": + frappe.db.sql( + """update tabSingles set value=%s where field="modified" and doctype=%s""", (original_modified, doc["name"]) + ) else: frappe.db.sql("update `tab%s` set modified=%s where name=%s" % (doc['doctype'], '%s', '%s'), (original_modified, doc['name'])) @@ -131,8 +143,8 @@ def import_doc(docdict, force=False, data_import=False, pre_process=None, frappe.flags.in_import = True docdict["__islocal"] = 1 - controller = get_controller(docdict['doctype']) - if controller and hasattr(controller, 'prepare_for_import') and callable(getattr(controller, 'prepare_for_import')): + controller = get_controller(docdict["doctype"]) + if controller and hasattr(controller, "prepare_for_import") and callable(getattr(controller, "prepare_for_import")): controller.prepare_for_import(docdict) doc = frappe.get_doc(docdict) @@ -161,15 +173,16 @@ def import_doc(docdict, force=False, data_import=False, pre_process=None, return doc + def load_code_properties(doc, path): - '''Load code files stored in separate files with extensions''' + """Load code files stored in separate files with extensions""" if path: - if hasattr(doc, 'get_code_fields'): + if hasattr(doc, "get_code_fields"): dirname, filename = os.path.split(path) for key, extn in doc.get_code_fields().items(): - codefile = os.path.join(dirname, filename.split('.')[0]+'.'+extn) + codefile = os.path.join(dirname, filename.split(".")[0] + "." + extn) if os.path.exists(codefile): - with open(codefile,'r') as txtfile: + with open(codefile, "r") as txtfile: doc.set(key, txtfile.read()) @@ -193,12 +206,13 @@ def delete_old_doc(doc, reset_permissions): doc.flags.ignore_children_type = ignore + def reset_tree_properties(doc): # Note on Tree DocTypes: # The tree structure is maintained in the database via the fields "lft" and # "rgt". They are automatically set and kept up-to-date. Importing them # would destroy any existing tree structure. - if getattr(doc.meta, 'is_tree', None) and any([doc.lft, doc.rgt]): + if getattr(doc.meta, "is_tree", None) and any([doc.lft, doc.rgt]): print('Ignoring values of `lft` and `rgt` for {} "{}"'.format(doc.doctype, doc.name)) doc.lft = None doc.rgt = None diff --git a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py index 55a7b74f7e..6b7a7695f6 100644 --- a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py +++ b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py @@ -1,7 +1,7 @@ - import frappe + def execute(): frappe.flags.in_patch = True - frappe.reload_doc('core', 'doctype', 'user_permission') + frappe.reload_doc("core", "doctype", "user_permission") frappe.db.commit() From 278883edb0dd0a9cb5842de7480df207e00a2152 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 20 Sep 2021 14:52:42 +0530 Subject: [PATCH 56/80] fix: missing migration hash column --- frappe/database/mariadb/framework_mariadb.sql | 1 + frappe/database/postgres/framework_postgres.sql | 1 + frappe/migrate.py | 3 ++- frappe/model/sync.py | 11 ++++------- frappe/modules/import_file.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index 670fb71aa2..73b98f0ff3 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -226,6 +226,7 @@ CREATE TABLE `tabDocType` ( `email_append_to` int(1) NOT NULL DEFAULT 0, `subject_field` varchar(255) DEFAULT NULL, `sender_field` varchar(255) DEFAULT NULL, + `migration_hash` varchar(255) DEFAULT NULL, PRIMARY KEY (`name`), KEY `parent` (`parent`) ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index 868f98fc98..e8e047f194 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -231,6 +231,7 @@ CREATE TABLE "tabDocType" ( "email_append_to" smallint NOT NULL DEFAULT 0, "subject_field" varchar(255) DEFAULT NULL, "sender_field" varchar(255) DEFAULT NULL, + "migration_hash" varchar(255) DEFAULT NULL, PRIMARY KEY ("name") ) ; diff --git a/frappe/migrate.py b/frappe/migrate.py index a9c609e461..ea60f3ab7f 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -18,6 +18,7 @@ from frappe.core.doctype.language.language import sync_languages from frappe.modules.utils import sync_customizations from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs from frappe.search.website_search import build_index_for_all_routes +from frappe.database.schema import add_column def migrate(verbose=True, skip_failing=False, skip_search_index=False): @@ -51,7 +52,7 @@ Otherwise, check the server logs and ensure that all the required services are r os.remove(touched_tables_file) try: - frappe.reload_doctype("DocType", force=True) + add_column(doctype="DocType", column_name="migration_hash", fieldtype="Data") frappe.flags.touched_tables = set() frappe.flags.in_migrate = True diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 70afd79723..4850eefa33 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -76,19 +76,16 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe # print each progress bar on new line print() -def get_doc_files(files, start_path): +def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=False): """walk and sync all doctypes and pages""" files = files or [] # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', - 'web_page', 'website_theme', 'web_form', 'web_template', - 'notification', 'print_style', - 'data_migration_mapping', 'data_migration_plan', - 'workspace', 'onboarding_step', 'module_onboarding', 'form_tour', - 'client_script', 'server_script', 'custom_field', 'property_setter'] - + 'website_theme', 'web_form', 'web_template', 'notification', 'print_style', + 'data_migration_mapping', 'data_migration_plan', 'workspace', + 'onboarding_step', 'module_onboarding'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) if os.path.exists(doctype_path): diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 7c3ebfddb3..097bb79cef 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -73,7 +73,7 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, if not force: try: db_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") - except: + except Exception: frappe.flags.dt += [doc["doctype"]] db_hash = None From 822fdce4d6f32dfb39a394d820e3d52fe74d1bf9 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 29 Sep 2021 10:19:27 +0530 Subject: [PATCH 57/80] fix: doctype doc hash creation --- frappe/modules/import_file.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 097bb79cef..05c0cb82e9 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -97,7 +97,11 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, ) if doc["doctype"] == "DocType": - frappe.db.set_value(doc["doctype"], doc["name"], "migration_hash", curr_hash) + if doc["name"] == "DocType": + Doctype_table=frappe.qb.DocType("DocType") + frappe.qb.update(Doctype_table).set(Doctype_table.migration_hash, curr_hash).where(Doctype_table.name == "DocType").run() + else: + frappe.db.set_value(doc["doctype"], doc["name"], "migration_hash", curr_hash) if original_modified: update_modified(original_modified, doc) From 69d8eddf5ae616d3c4a187d6acb2600419645745 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 4 Oct 2021 13:14:57 +0530 Subject: [PATCH 58/80] refactor: remove unused args refactor: remove unused args --- frappe/installer.py | 2 +- frappe/migrate.py | 7 ++++--- frappe/model/sync.py | 13 ++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index e1b67ee10c..16198c8931 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -158,7 +158,7 @@ def install_app(name, verbose=False, set_as_patched=True): if name != "frappe": add_module_defs(name) - sync_for(name, force=True, sync_everything=True, verbose=verbose, reset_permissions=True) + sync_for(name, force=True, reset_permissions=True) add_to_installed_apps(name) diff --git a/frappe/migrate.py b/frappe/migrate.py index ea60f3ab7f..6abc38796f 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -27,9 +27,10 @@ def migrate(verbose=True, skip_failing=False, skip_search_index=False): - run patches - sync doctypes (schema) - sync dashboards + - sync jobs - sync fixtures - - sync desktop icons - - sync web pages (from /www) + - sync customizations + - sync languages - sync web pages (from /www) - run after migrate hooks ''' @@ -67,7 +68,7 @@ Otherwise, check the server logs and ensure that all the required services are r frappe.modules.patch_handler.run_all(skip_failing) # sync - frappe.model.sync.sync_all(verbose=verbose) + frappe.model.sync.sync_all() frappe.translate.clear_cache() sync_jobs() sync_fixtures() diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 4850eefa33..e28c8ae4a7 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -10,17 +10,17 @@ from frappe.modules.import_file import import_file_by_path from frappe.modules.patch_handler import block_user from frappe.utils import update_progress_bar -def sync_all(force=0, verbose=False, reset_permissions=False): +def sync_all(force=0, reset_permissions=False): block_user(True) for app in frappe.get_installed_apps(): - sync_for(app, force, verbose=verbose, reset_permissions=reset_permissions) + sync_for(app, force, reset_permissions=reset_permissions) block_user(False) frappe.clear_cache() -def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_permissions=False): +def sync_for(app_name, force=0, reset_permissions=False): files = [] if app_name == "frappe": @@ -59,14 +59,13 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe for module_name in frappe.local.app_modules.get(app_name) or []: folder = os.path.dirname(frappe.get_module(app_name + "." + module_name).__file__) - files = get_doc_files(files, folder, force, sync_everything, verbose=verbose) + files = get_doc_files(files=files, start_path=folder) l = len(files) if l: for i, doc_path in enumerate(files): - import_file_by_path(doc_path, force=force, ignore_version=True, - reset_permissions=reset_permissions, for_sync=True) + import_file_by_path(doc_path, force=force, ignore_version=True, reset_permissions=reset_permissions, for_sync=True) frappe.db.commit() @@ -76,7 +75,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe # print each progress bar on new line print() -def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=False): +def get_doc_files(files, start_path): """walk and sync all doctypes and pages""" files = files or [] From 33bfd5bd19ee68d1d0871ffd14529624c85dc3c6 Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Mon, 11 Oct 2021 18:43:12 +0530 Subject: [PATCH 59/80] fix: Private images in comments are not visible --- frappe/desk/form/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py index bd04e1915c..1c954edff0 100644 --- a/frappe/desk/form/utils.py +++ b/frappe/desk/form/utils.py @@ -66,7 +66,8 @@ def add_comment(reference_doctype, reference_name, content, comment_email, comme comment_type='Comment', comment_by=comment_by )) - doc.content = extract_images_from_html(doc, content, is_private=True) + reference_doc = frappe.get_doc(reference_doctype, reference_name) + doc.content = extract_images_from_html(reference_doc, content, is_private=True) doc.insert(ignore_permissions=True) follow_document(doc.reference_doctype, doc.reference_name, frappe.session.user) From 3ac65adb94636b75ee1ece2a173c9879e4ac650d Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 5 Oct 2021 20:24:04 +0530 Subject: [PATCH 60/80] style: misc changes --- frappe/modules/import_file.py | 59 ++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 05c0cb82e9..2c860055c9 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -1,16 +1,26 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE -import frappe, os, json +import hashlib +import json +import os + +import frappe +from frappe.model.base_document import get_controller from frappe.modules import get_module_path, scrub_dt_dn from frappe.utils import get_datetime_str -from frappe.model.base_document import get_controller - -import hashlib -def md5(fname): +def caclulate_hash(path: str) -> str: + """Calculate md5 hash of the file in binary mode + + Args: + path (str): Path to the file to be hashed + + Returns: + str: The calculated hash + """ hash_md5 = hashlib.md5() - with open(fname, "rb") as f: + with open(path, "rb") as f: for chunk in iter(lambda: f.read(4096), b""): hash_md5.update(chunk) return hash_md5.hexdigest() @@ -32,9 +42,7 @@ def import_files(module, dt=None, dn=None, force=False, pre_process=None, reset_ if type(module) is list: out = [] for m in module: - out.append( - import_file(m[0], m[1], m[2], force=force, pre_process=pre_process, reset_permissions=reset_permissions) - ) + out.append(import_file(m[0], m[1], m[2], force=force, pre_process=pre_process, reset_permissions=reset_permissions)) return out else: return import_file(module, dt, dn, force=force, pre_process=pre_process, reset_permissions=reset_permissions) @@ -54,8 +62,7 @@ def get_file_path(module, dt, dn): return path -def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, - reset_permissions=False, for_sync=False): +def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, for_sync=False): frappe.flags.dt = frappe.flags.dt or [] try: docs = read_doc_from_file(path) @@ -63,7 +70,7 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, print(f"{path} missing") return - curr_hash = md5(path) + calculated_hash = caclulate_hash(path) if docs: if not isinstance(docs, list): @@ -72,16 +79,16 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, for doc in docs: if not force: try: - db_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") + stored_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") except Exception: frappe.flags.dt += [doc["doctype"]] - db_hash = None + stored_hash = None - if not db_hash: - db_modified = frappe.db.get_value(doc["doctype"], doc["name"], "modified") - if db_modified and doc.get("modified") == get_datetime_str(db_modified): - return False - if curr_hash == db_hash: + # fallback if stored_hash doesn't exist + if not stored_hash and is_timestamp_changed(doc): + return False + + if calculated_hash == stored_hash: return False original_modified = doc.get("modified") @@ -96,12 +103,10 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, path=path, ) + # not using db.set_value to avoid making changes in tabSingles if doc["doctype"] == "DocType": - if doc["name"] == "DocType": - Doctype_table=frappe.qb.DocType("DocType") - frappe.qb.update(Doctype_table).set(Doctype_table.migration_hash, curr_hash).where(Doctype_table.name == "DocType").run() - else: - frappe.db.set_value(doc["doctype"], doc["name"], "migration_hash", curr_hash) + doctype_table = frappe.qb.DocType("DocType") + frappe.qb.update(doctype_table).set(doctype_table.migration_hash, calculated_hash).where(doctype_table.name == doc["name"]).run() if original_modified: update_modified(original_modified, doc) @@ -109,12 +114,10 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, return True -def is_changed(doc): +def is_timestamp_changed(doc): # check if timestamps match db_modified = frappe.db.get_value(doc["doctype"], doc["name"], "modified") - if db_modified and doc.get("modified") == get_datetime_str(db_modified): - return False - return True + return not (db_modified and doc.get("modified") == get_datetime_str(db_modified)) def read_doc_from_file(path): From 547111841ae62b8eca9821061aca7dacd97c5314 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 5 Oct 2021 20:25:19 +0530 Subject: [PATCH 61/80] refactor: sql in update_modified() to frappe.qb --- frappe/modules/import_file.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 2c860055c9..00f298655f 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -138,15 +138,28 @@ def read_doc_from_file(path): def update_modified(original_modified, doc): # since there is a new timestamp on the file, update timestamp in if doc["doctype"] == doc["name"] and doc["name"] != "DocType": - frappe.db.sql( - """update tabSingles set value=%s where field="modified" and doctype=%s""", (original_modified, doc["name"]) - ) - else: - frappe.db.sql("update `tab%s` set modified=%s where name=%s" % (doc['doctype'], - '%s', '%s'), (original_modified, doc['name'])) + singles_table = frappe.qb.DocType("Singles") -def import_doc(docdict, force=False, data_import=False, pre_process=None, - ignore_version=None, reset_permissions=False, path=None): + frappe.qb.update( + singles_table + ).set( + singles_table.value,original_modified + ).where( + singles_table.field == "modified" + ).where( + singles_table.doctype == doc["name"] + ).run() + else: + doctype_table = frappe.qb.DocType(doc['doctype']) + + frappe.qb.update(doctype_table + ).set( + doctype_table.modified, original_modified + ).where( + doctype_table.name == doc["name"] + ).run() + +def import_doc(docdict, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, path=None): frappe.flags.in_import = True docdict["__islocal"] = 1 From 0be59cee807ef6167883fe32680f2c177202f2d5 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 5 Oct 2021 20:26:18 +0530 Subject: [PATCH 62/80] chore: add missing document_types --- frappe/model/sync.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index e28c8ae4a7..bd6dacf332 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -81,10 +81,29 @@ def get_doc_files(files, start_path): files = files or [] # load in sequence - warning for devs - document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', - 'website_theme', 'web_form', 'web_template', 'notification', 'print_style', - 'data_migration_mapping', 'data_migration_plan', 'workspace', - 'onboarding_step', 'module_onboarding'] + document_types = [ + "doctype", + "page", + "report", + "dashboard_chart_source", + "print_format", + "web_page", + "website_theme", + "web_form", + "web_template", + "notification", + "print_style", + "data_migration_mapping", + "data_migration_plan", + "workspace", + "onboarding_step", + "module_onboarding", + "form_tour", + "client_script", + "server_script", + "custom_field", + "property_setter", + ] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) if os.path.exists(doctype_path): @@ -95,4 +114,4 @@ def get_doc_files(files, start_path): if not doc_path in files: files.append(doc_path) - return files \ No newline at end of file + return files From f3d810414a3823de0c369b09aae756aea83c7457 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 6 Oct 2021 01:57:31 +0530 Subject: [PATCH 63/80] refactor: sync_for() - first install module --- frappe/model/sync.py | 68 ++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index bd6dacf332..6f829d6135 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -10,6 +10,7 @@ from frappe.modules.import_file import import_file_by_path from frappe.modules.patch_handler import block_user from frappe.utils import update_progress_bar + def sync_all(force=0, reset_permissions=False): block_user(True) @@ -20,42 +21,46 @@ def sync_all(force=0, reset_permissions=False): frappe.clear_cache() + def sync_for(app_name, force=0, reset_permissions=False): files = [] if app_name == "frappe": # these need to go first at time of install - for d in (("core", "docfield"), - ("core", "docperm"), - ("core", "doctype_action"), - ("core", "doctype_link"), - ("core", "role"), - ("core", "has_role"), - ("core", "doctype"), - ("core", "user"), - ("custom", "custom_field"), - ("custom", "property_setter"), - ("website", "web_form"), - ("website", "web_template"), - ("website", "web_form_field"), - ("website", "portal_menu_item"), - ("data_migration", "data_migration_mapping_detail"), - ("data_migration", "data_migration_mapping"), - ("data_migration", "data_migration_plan_mapping"), - ("data_migration", "data_migration_plan"), - ("desk", "number_card"), - ("desk", "dashboard_chart"), - ("desk", "dashboard"), - ("desk", "onboarding_permission"), - ("desk", "onboarding_step"), - ("desk", "onboarding_step_map"), - ("desk", "module_onboarding"), - ("desk", "workspace_link"), - ("desk", "workspace_chart"), - ("desk", "workspace_shortcut"), - ("desk", "workspace")): - files.append(os.path.join(frappe.get_app_path("frappe"), d[0], - "doctype", d[1], d[1] + ".json")) + + FRAPPE_PATH = frappe.get_app_path("frappe") + + for core_module in ["docfield", "docperm", "doctype_action", "doctype_link", "role", "has_role", "doctype"]: + files.append(os.path.join(FRAPPE_PATH, "core", "doctype", core_module, f"{core_module}.json")) + + for custom_module in ["custom_field", "property_setter"]: + files.append(os.path.join(FRAPPE_PATH, "custom", "doctype", custom_module, f"{custom_module}.json")) + + for website_module in ["web_form", "web_template", "web_form_field", "portal_menu_item"]: + files.append(os.path.join(FRAPPE_PATH, "website", "doctype", website_module, f"{website_module}.json")) + + for data_migration_module in [ + "data_migration_mapping_detail", + "data_migration_mapping", + "data_migration_plan_mapping", + "data_migration_plan", + ]: + files.append(os.path.join(FRAPPE_PATH, "data_migration", "doctype", data_migration_module, f"{data_migration_module}.json")) + + for desk_module in [ + "number_card", + "dashboard_chart", + "dashboard", + "onboarding_permission", + "onboarding_step", + "onboarding_step_map", + "module_onboarding", + "workspace_link", + "workspace_chart", + "workspace_shortcut", + "workspace", + ]: + files.append(os.path.join(FRAPPE_PATH, "desk", "doctype", desk_module, f"{desk_module}.json")) for module_name in frappe.local.app_modules.get(app_name) or []: folder = os.path.dirname(frappe.get_module(app_name + "." + module_name).__file__) @@ -75,6 +80,7 @@ def sync_for(app_name, force=0, reset_permissions=False): # print each progress bar on new line print() + def get_doc_files(files, start_path): """walk and sync all doctypes and pages""" From 2622f3398e61df302ab94a6ef839a1f55304e0d4 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 7 Oct 2021 17:21:13 +0530 Subject: [PATCH 64/80] style: Black-ish queries * feat(minor): Added DocType to frappe.query_builder namespace --- frappe/modules/import_file.py | 12 +++++++----- frappe/query_builder/__init__.py | 2 +- frappe/query_builder/utils.py | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 00f298655f..230a59df6e 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -8,7 +8,7 @@ import frappe from frappe.model.base_document import get_controller from frappe.modules import get_module_path, scrub_dt_dn from frappe.utils import get_datetime_str - +from frappe.query_builder import DocType def caclulate_hash(path: str) -> str: """Calculate md5 hash of the file in binary mode @@ -106,7 +106,9 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, # not using db.set_value to avoid making changes in tabSingles if doc["doctype"] == "DocType": doctype_table = frappe.qb.DocType("DocType") - frappe.qb.update(doctype_table).set(doctype_table.migration_hash, calculated_hash).where(doctype_table.name == doc["name"]).run() + frappe.qb.update(doctype_table).set( + doctype_table.migration_hash, calculated_hash + ).where(doctype_table.name == doc["name"]).run() if original_modified: update_modified(original_modified, doc) @@ -138,7 +140,7 @@ def read_doc_from_file(path): def update_modified(original_modified, doc): # since there is a new timestamp on the file, update timestamp in if doc["doctype"] == doc["name"] and doc["name"] != "DocType": - singles_table = frappe.qb.DocType("Singles") + singles_table = DocType("Singles") frappe.qb.update( singles_table @@ -150,8 +152,8 @@ def update_modified(original_modified, doc): singles_table.doctype == doc["name"] ).run() else: - doctype_table = frappe.qb.DocType(doc['doctype']) - + doctype_table = DocType(doc['doctype']) + frappe.qb.update(doctype_table ).set( doctype_table.modified, original_modified diff --git a/frappe/query_builder/__init__.py b/frappe/query_builder/__init__.py index 6987ba24ab..4a1fe8fb84 100644 --- a/frappe/query_builder/__init__.py +++ b/frappe/query_builder/__init__.py @@ -1,2 +1,2 @@ from pypika import * -from frappe.query_builder.utils import Column, get_query_builder, patch_query_execute +from frappe.query_builder.utils import Column, DocType, get_query_builder, patch_query_execute diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index abd700c396..386ddda751 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -44,6 +44,9 @@ def get_attr(method_string): methodname = method_string.split('.')[-1] return getattr(import_module(modulename), methodname) +def DocType(*args, **kwargs): + return frappe.qb.DocType(*args, **kwargs) + def patch_query_execute(): """Patch the Query Builder with helper execute method This excludes the use of `frappe.db.sql` method while From 875f35ec14d7edc5d379bd97c00c6c7516c69dbc Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 11 Oct 2021 19:35:51 +0530 Subject: [PATCH 65/80] fix: Rate limiter on blog feedback (#14322) * fix: Added rate limiter on blog feedback * test: Updated test to support rate limiter --- frappe/core/doctype/feedback/test_feedback.py | 16 +++++++++++++++- frappe/templates/includes/feedback/feedback.py | 15 +++------------ frappe/website/doctype/blog_post/blog_post.json | 4 +--- .../doctype/blog_settings/blog_settings.json | 17 +++++++++++++++-- .../doctype/blog_settings/blog_settings.py | 5 ++++- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/frappe/core/doctype/feedback/test_feedback.py b/frappe/core/doctype/feedback/test_feedback.py index 7a722ae0d1..f3cf8dfe6b 100644 --- a/frappe/core/doctype/feedback/test_feedback.py +++ b/frappe/core/doctype/feedback/test_feedback.py @@ -5,6 +5,13 @@ import frappe import unittest class TestFeedback(unittest.TestCase): + def tearDown(self): + frappe.form_dict.reference_doctype = None + frappe.form_dict.reference_name = None + frappe.form_dict.rating = None + frappe.form_dict.feedback = None + frappe.local.request_ip = None + def test_feedback_creation_updation(self): from frappe.website.doctype.blog_post.test_blog_post import make_test_blog test_blog = make_test_blog() @@ -12,7 +19,14 @@ class TestFeedback(unittest.TestCase): frappe.db.delete("Feedback", {"reference_doctype": "Blog Post"}) from frappe.templates.includes.feedback.feedback import add_feedback, update_feedback - feedback = add_feedback('Blog Post', test_blog.name, 5, 'New feedback') + + frappe.form_dict.reference_doctype = 'Blog Post' + frappe.form_dict.reference_name = test_blog.name + frappe.form_dict.rating = 5 + frappe.form_dict.feedback = 'New feedback' + frappe.local.request_ip = '127.0.0.1' + + feedback = add_feedback() self.assertEqual(feedback.feedback, 'New feedback') self.assertEqual(feedback.rating, 5) diff --git a/frappe/templates/includes/feedback/feedback.py b/frappe/templates/includes/feedback/feedback.py index 63502f137a..e1a6f8e881 100644 --- a/frappe/templates/includes/feedback/feedback.py +++ b/frappe/templates/includes/feedback/feedback.py @@ -3,27 +3,18 @@ from __future__ import unicode_literals import frappe -from frappe.utils import add_to_date, now from frappe import _ +from frappe.rate_limiter import rate_limit +from frappe.website.doctype.blog_settings.blog_settings import get_feedback_limit @frappe.whitelist(allow_guest=True) +@rate_limit(key='reference_name', limit=get_feedback_limit, seconds=60*60) def add_feedback(reference_doctype, reference_name, rating, feedback): doc = frappe.get_doc(reference_doctype, reference_name) if doc.disable_feedback == 1: return - feedback_count = frappe.db.count("Feedback", { - "reference_doctype": reference_doctype, - "reference_name": reference_name, - "ip_address": frappe.local.request_ip, - "creation": (">", add_to_date(now(), hours=-1)) - }) - - if feedback_count > 20: - frappe.msgprint(_('Hourly feedback limit reached')) - return - doc = frappe.new_doc('Feedback') doc.reference_doctype = reference_doctype doc.reference_name = reference_name diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index c2491ee5a4..9400016c48 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -130,7 +130,6 @@ }, { "default": "0", - "description": "Comments on this blog post will be disabled if checked.", "fieldname": "disable_comments", "fieldtype": "Check", "label": "Disable Comments" @@ -195,7 +194,6 @@ }, { "default": "0", - "description": "Feedback on this blog post will be disabled if checked.", "fieldname": "disable_feedback", "fieldtype": "Check", "label": "Disable Feedback" @@ -208,7 +206,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2021-06-14 13:50:02.109719", + "modified": "2021-09-13 17:19:35.436045", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index 73ea3ce877..251e007e72 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -15,7 +15,9 @@ "subtitle", "column_break_11", "cta_label", - "cta_url" + "cta_url", + "section_break_12", + "feedback_limit" ], "fields": [ { @@ -78,13 +80,24 @@ { "fieldname": "column_break_11", "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_12", + "fieldtype": "Section Break" + }, + { + "default": "1", + "description": "Feedback limit per hour", + "fieldname": "feedback_limit", + "fieldtype": "Int", + "label": "Feedback limit" } ], "icon": "fa fa-cog", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-06-01 15:57:21.564652", + "modified": "2021-09-30 13:00:18.887103", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", diff --git a/frappe/website/doctype/blog_settings/blog_settings.py b/frappe/website/doctype/blog_settings/blog_settings.py index dadabc8f11..fc9dcc2b4c 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.py +++ b/frappe/website/doctype/blog_settings/blog_settings.py @@ -12,4 +12,7 @@ class BlogSettings(Document): def on_update(self): from frappe.website.utils import clear_cache clear_cache("blog") - clear_cache("writers") \ No newline at end of file + clear_cache("writers") + +def get_feedback_limit(): + return frappe.db.get_single_value("Blog Settings", "feedback_limit") or 0 \ No newline at end of file From 86f29aeaa34db8456161e530da0e4ed7bf500911 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 12 Oct 2021 03:21:08 +0530 Subject: [PATCH 66/80] fix: missing logical cases - handle first time imports - update hash and timestamps --- frappe/modules/import_file.py | 40 +++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 230a59df6e..f4179fb811 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -7,8 +7,9 @@ import os import frappe from frappe.model.base_document import get_controller from frappe.modules import get_module_path, scrub_dt_dn -from frappe.utils import get_datetime_str from frappe.query_builder import DocType +from frappe.utils import get_datetime_str, now + def caclulate_hash(path: str) -> str: """Calculate md5 hash of the file in binary mode @@ -77,22 +78,26 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, docs = [docs] for doc in docs: - if not force: + + # modified timestamp in db, none if doctype's first import + db_modified_timestamp = frappe.db.get_value(doc["doctype"], doc["name"], "modified") + is_db_timestamp_latest = db_modified_timestamp and doc.get("modified") <= get_datetime_str(db_modified_timestamp) + + if not force or db_modified_timestamp: try: stored_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") except Exception: frappe.flags.dt += [doc["doctype"]] stored_hash = None - # fallback if stored_hash doesn't exist - if not stored_hash and is_timestamp_changed(doc): + # if hash exists and is equal no need to update + if stored_hash and stored_hash == calculated_hash: return False - if calculated_hash == stored_hash: + # if hash doesn't exist, check if db timestamp is same as json timestamp, add hash if from doctype + if is_db_timestamp_latest and doc["doctype"] != "DocType": return False - original_modified = doc.get("modified") - import_doc( docdict=doc, force=force, @@ -103,15 +108,24 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, path=path, ) - # not using db.set_value to avoid making changes in tabSingles if doc["doctype"] == "DocType": - doctype_table = frappe.qb.DocType("DocType") - frappe.qb.update(doctype_table).set( + doctype_table = DocType("DocType") + frappe.qb.update( + doctype_table + ).set( doctype_table.migration_hash, calculated_hash - ).where(doctype_table.name == doc["name"]).run() + ).where( + doctype_table.name == doc["name"] + ).run() - if original_modified: - update_modified(original_modified, doc) + new_modified_timestamp = doc.get("modified") + + # if db timestamp is newer, hash must have changed, must update db timestamp + if is_db_timestamp_latest and doc["doctype"] == "DocType": + new_modified_timestamp = now() + + if new_modified_timestamp: + update_modified(new_modified_timestamp, doc) return True From 14ae20bdb8435fdaaef399bfeb3b8e1dca05750a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 12 Oct 2021 09:54:09 +0530 Subject: [PATCH 67/80] fix: Push aggregate_on_field to field list - for proper extraction of child table --- frappe/desk/reportview.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index c75d730b2f..f9d4a890f4 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -127,6 +127,8 @@ def setup_group_by(data): if frappe.db.has_column(data.aggregate_on_doctype, data.aggregate_on_field): data.fields.append('{aggregate_function}(`tab{aggregate_on_doctype}`.`{aggregate_on_field}`) AS _aggregate_column'.format(**data)) + if data.aggregate_on_field: + data.fields.append("`tab{aggregate_on_doctype}`.`{aggregate_on_field}`".format(**data)) else: raise_invalid_field(data.aggregate_on_field) From 8febefae9ca7e6fee649f1b26dd2bf5ee57ab619 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 12 Oct 2021 12:05:05 +0530 Subject: [PATCH 68/80] test: Add test case to validate aggregation - based on child table field --- frappe/tests/test_db_query.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 84d0d31616..0db5f8b698 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -446,6 +446,22 @@ class TestReportview(unittest.TestCase): user.remove_roles("Blogger", "Website Manager") user.add_roles(*user_roles) + def test_reportview_get_aggregation(self): + # test aggregation based on child table field + frappe.local.form_dict = frappe._dict({ + "doctype": "DocType", + "fields": """["`tabDocField`.`hidden` as hidden","sum(`tabDocField`.`columns`) as _aggregate_column","`tabDocField`.`columns`"]""", + "filters": "[]", + "order_by": "_aggregate_column desc", + "start": 0, + "page_length": 20, + "view": "Report", + "with_comment_count": 0, + "group_by": "`tabDocField`.`hidden`, columns" + }) + + response = execute_cmd("frappe.desk.reportview.get") + self.assertListEqual(response["keys"], ["hidden", "_aggregate_column", "columns"]) def add_child_table_to_blog_post(): child_table = frappe.get_doc({ From ab009803893781c29abdb6ae25b6eff3f3a76ec9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 12 Oct 2021 12:06:08 +0530 Subject: [PATCH 69/80] refactor: Use f-string Co-authored-by: gavin --- frappe/desk/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index f9d4a890f4..31eb224652 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -128,7 +128,7 @@ def setup_group_by(data): if frappe.db.has_column(data.aggregate_on_doctype, data.aggregate_on_field): data.fields.append('{aggregate_function}(`tab{aggregate_on_doctype}`.`{aggregate_on_field}`) AS _aggregate_column'.format(**data)) if data.aggregate_on_field: - data.fields.append("`tab{aggregate_on_doctype}`.`{aggregate_on_field}`".format(**data)) + data.fields.append(f"`tab{data.aggregate_on_doctype}`.`{data.aggregate_on_field}`") else: raise_invalid_field(data.aggregate_on_field) From f6e83dbcaf02d550976d2ae5930ea5f2a3b61a71 Mon Sep 17 00:00:00 2001 From: Anupam Date: Tue, 12 Oct 2021 12:35:40 +0530 Subject: [PATCH 70/80] fix: Customize is not listed in menu item [Print] --- frappe/printing/page/print/print.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js index c1ab56b181..1e158c616e 100644 --- a/frappe/printing/page/print/print.js +++ b/frappe/printing/page/print/print.js @@ -171,7 +171,7 @@ frappe.ui.form.PrintView = class { }); } - if (frappe.perm.has_perm('Print Format', 0, 'create')) { + if (frappe.model.can_create('Print Format')) { this.page.add_menu_item(__('Customize'), () => this.edit_print_format() ); From 74ec9657da2b26c7f5474c86874de65b4ee8880d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 12 Oct 2021 13:36:30 +0530 Subject: [PATCH 71/80] test: Update aggregation test --- frappe/tests/test_db_query.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 0db5f8b698..8030e43a77 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -450,18 +450,21 @@ class TestReportview(unittest.TestCase): # test aggregation based on child table field frappe.local.form_dict = frappe._dict({ "doctype": "DocType", - "fields": """["`tabDocField`.`hidden` as hidden","sum(`tabDocField`.`columns`) as _aggregate_column","`tabDocField`.`columns`"]""", + "fields": """["`tabDocField`.`label` as field_label","`tabDocField`.`name` as field_name"]""", "filters": "[]", "order_by": "_aggregate_column desc", "start": 0, "page_length": 20, "view": "Report", "with_comment_count": 0, - "group_by": "`tabDocField`.`hidden`, columns" + "group_by": "field_label, field_name", + "aggregate_on_field": "columns", + "aggregate_on_doctype": "DocField", + "aggregate_function": "sum" }) response = execute_cmd("frappe.desk.reportview.get") - self.assertListEqual(response["keys"], ["hidden", "_aggregate_column", "columns"]) + self.assertListEqual(response["keys"], ["field_label", "field_name", "_aggregate_column"]) def add_child_table_to_blog_post(): child_table = frappe.get_doc({ From 18df0b0f8c65e253885619c6f480ca8a47a412ed Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 12 Oct 2021 13:46:06 +0530 Subject: [PATCH 72/80] test: Fix test --- frappe/tests/test_db_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 8030e43a77..eb2c7b5283 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -464,7 +464,7 @@ class TestReportview(unittest.TestCase): }) response = execute_cmd("frappe.desk.reportview.get") - self.assertListEqual(response["keys"], ["field_label", "field_name", "_aggregate_column"]) + self.assertListEqual(response["keys"], ["field_label", "field_name", "_aggregate_column", 'columns']) def add_child_table_to_blog_post(): child_table = frappe.get_doc({ From ae88fca3efd97e040ace8f9d4d3e078d4366a738 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 10:59:59 +0530 Subject: [PATCH 73/80] refactor: split remove_app in smaller functions --- frappe/installer.py | 72 +++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index e1b67ee10c..fff445d9e4 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -4,6 +4,7 @@ import json import os import sys +from typing import List import frappe from frappe.defaults import _clear_cache @@ -230,9 +231,28 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) scheduled_backup(ignore_files=True) frappe.flags.in_uninstall = True + + drop_doctypes = _delete_modules(app_name, dry_run=dry_run) + _delete_doctypes(drop_doctypes, dry_run=dry_run) + + if not dry_run: + remove_from_installed_apps(app_name) + frappe.db.commit() + + click.secho(f"Uninstalled App {app_name} from Site {site}", fg="green") + frappe.flags.in_uninstall = False + + +def _delete_modules(app_name: str, dry_run: bool) -> List[str]: + """ Delete modules belonging to the app and all related doctypes. + + Note: All record linked linked to Module Def are also deleted. + + Returns: list of deleted doctypes.""" drop_doctypes = [] modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") + for module_name in modules: print(f"Deleting Module '{module_name}'") @@ -247,40 +267,42 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) if not doctype.issingle: drop_doctypes.append(doctype.name) - linked_doctypes = frappe.get_all( - "DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=["parent"] - ) - ordered_doctypes = ["Workspace", "Report", "Page", "Web Form"] - all_doctypes_with_linked_modules = ordered_doctypes + [ - doctype.parent - for doctype in linked_doctypes - if doctype.parent not in ordered_doctypes - ] - doctypes_with_linked_modules = [ - x for x in all_doctypes_with_linked_modules if frappe.db.exists("DocType", x) - ] - for doctype in doctypes_with_linked_modules: - for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): - print(f"* removing {doctype} '{record}'...") - if not dry_run: - frappe.delete_doc(doctype, record, ignore_on_trash=True, force=True) + _delete_linked_documents(module_name, dry_run=dry_run) print(f"* removing Module Def '{module_name}'...") if not dry_run: frappe.delete_doc("Module Def", module_name, ignore_on_trash=True, force=True) - for doctype in set(drop_doctypes): + return drop_doctypes + + +def _delete_linked_documents(module_name: str, dry_run: bool) -> None: + """Deleted all records linked with module def""" + linked_doctypes = frappe.get_all( + "DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=["parent"] + ) + ordered_doctypes = ["Workspace", "Report", "Page", "Web Form"] + all_doctypes_with_linked_modules = ordered_doctypes + [ + doctype.parent + for doctype in linked_doctypes + if doctype.parent not in ordered_doctypes + ] + doctypes_with_linked_modules = [ + x for x in all_doctypes_with_linked_modules if frappe.db.exists("DocType", x) + ] + for doctype in doctypes_with_linked_modules: + for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): + print(f"* removing {doctype} '{record}'...") + if not dry_run: + frappe.delete_doc(doctype, record, ignore_on_trash=True, force=True) + + +def _delete_doctypes(doctypes: List[str], dry_run: bool) -> None: + for doctype in set(doctypes): print(f"* dropping Table for '{doctype}'...") if not dry_run: frappe.db.sql_ddl(f"drop table `tab{doctype}`") - if not dry_run: - remove_from_installed_apps(app_name) - frappe.db.commit() - - click.secho(f"Uninstalled App {app_name} from Site {site}", fg="green") - frappe.flags.in_uninstall = False - def post_install(rebuild_website=False): from frappe.website.utils import clear_website_cache From 412aa9f5cc3c3ce008605499d915f0cde00f51e9 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 11:33:54 +0530 Subject: [PATCH 74/80] fix: fieldname for linkfield hardcoded to "module" Remove_app assumed that all link fileds linking to "Module Def" are called "module", this causes uninstall failure and leaves bench in pseudo-irrecoverable state. (requiring some manual cleanup) --- frappe/installer.py | 54 +++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index fff445d9e4..1ad003cdbf 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -4,7 +4,8 @@ import json import os import sys -from typing import List +from collections import OrderedDict +from typing import List, Dict import frappe from frappe.defaults import _clear_cache @@ -253,6 +254,7 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") + doctype_link_field_map = _get_module_linked_doctype_field_map() for module_name in modules: print(f"Deleting Module '{module_name}'") @@ -267,7 +269,7 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: if not doctype.issingle: drop_doctypes.append(doctype.name) - _delete_linked_documents(module_name, dry_run=dry_run) + _delete_linked_documents(module_name, doctype_link_field_map, dry_run=dry_run) print(f"* removing Module Def '{module_name}'...") if not dry_run: @@ -276,26 +278,44 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: return drop_doctypes -def _delete_linked_documents(module_name: str, dry_run: bool) -> None: +def _delete_linked_documents( + module_name: str, + doctype_linkfield_map: Dict[str, str], + dry_run: bool + ) -> None: + """Deleted all records linked with module def""" - linked_doctypes = frappe.get_all( - "DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=["parent"] - ) - ordered_doctypes = ["Workspace", "Report", "Page", "Web Form"] - all_doctypes_with_linked_modules = ordered_doctypes + [ - doctype.parent - for doctype in linked_doctypes - if doctype.parent not in ordered_doctypes - ] - doctypes_with_linked_modules = [ - x for x in all_doctypes_with_linked_modules if frappe.db.exists("DocType", x) - ] - for doctype in doctypes_with_linked_modules: - for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): + for doctype, fieldname in doctype_linkfield_map.items(): + for record in frappe.get_all(doctype, filters={fieldname: module_name}, pluck="name"): print(f"* removing {doctype} '{record}'...") if not dry_run: frappe.delete_doc(doctype, record, ignore_on_trash=True, force=True) +def _get_module_linked_doctype_field_map() -> Dict[str, str]: + """ Get all the doctypes which have module linked with them. + + returns ordered dictionary with doctype->link field mapping.""" + + # Hardcoded to change order of deletion + ordered_doctypes = [ + ("Workspace", "module"), + ("Report", "module"), + ("Page", "module"), + ("Web Form", "module") + ] + doctype_to_field_map = OrderedDict(ordered_doctypes) + + linked_doctypes = frappe.get_all( + "DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=["parent", "fieldname"] + ) + existing_linked_doctypes = [d for d in linked_doctypes if frappe.db.exists("DocType", d.parent)] + + for d in existing_linked_doctypes: + if d.parent not in doctype_to_field_map: + doctype_to_field_map[d.parent] = d.fieldname + + return doctype_to_field_map + def _delete_doctypes(doctypes: List[str], dry_run: bool) -> None: for doctype in set(doctypes): From aa372b099001e1fe9e2966c246f62923c098e7bd Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 12:20:47 +0530 Subject: [PATCH 75/80] fix: change order of deletion Previous order was: 1. Delete DocTypes 2. Delete linked records 3. Drop tables Now if linked records belonged to deleted doctypes it causes uninstallation failure. Changed order to: 1. Delete linked records 2. Delete DocTypes 3. Drop tables --- frappe/installer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 1ad003cdbf..c38ee55e65 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -264,9 +264,9 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: print(f"* removing DocType '{doctype.name}'...") if not dry_run: - frappe.delete_doc("DocType", doctype.name, ignore_on_trash=True) - - if not doctype.issingle: + if doctype.issingle: + frappe.delete_doc("DocType", doctype.name, ignore_on_trash=True) + else: drop_doctypes.append(doctype.name) _delete_linked_documents(module_name, doctype_link_field_map, dry_run=dry_run) @@ -311,7 +311,8 @@ def _get_module_linked_doctype_field_map() -> Dict[str, str]: existing_linked_doctypes = [d for d in linked_doctypes if frappe.db.exists("DocType", d.parent)] for d in existing_linked_doctypes: - if d.parent not in doctype_to_field_map: + # DocType deletion is handled separately in the end + if d.parent not in doctype_to_field_map and d.parent != "DocType": doctype_to_field_map[d.parent] = d.fieldname return doctype_to_field_map @@ -321,6 +322,7 @@ def _delete_doctypes(doctypes: List[str], dry_run: bool) -> None: for doctype in set(doctypes): print(f"* dropping Table for '{doctype}'...") if not dry_run: + frappe.delete_doc("DocType", doctype, ignore_on_trash=True) frappe.db.sql_ddl(f"drop table `tab{doctype}`") From 70fcac8acf5e8e1dc0708f1794e676e75e9529e2 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 17:10:14 +0530 Subject: [PATCH 76/80] refactor: change _delete_modules for testability --- frappe/installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index c38ee55e65..9df2019f1b 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -233,7 +233,9 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) frappe.flags.in_uninstall = True - drop_doctypes = _delete_modules(app_name, dry_run=dry_run) + modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") + + drop_doctypes = _delete_modules(modules, dry_run=dry_run) _delete_doctypes(drop_doctypes, dry_run=dry_run) if not dry_run: @@ -244,7 +246,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) frappe.flags.in_uninstall = False -def _delete_modules(app_name: str, dry_run: bool) -> List[str]: +def _delete_modules(modules: List[str], dry_run: bool) -> List[str]: """ Delete modules belonging to the app and all related doctypes. Note: All record linked linked to Module Def are also deleted. @@ -252,8 +254,6 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: Returns: list of deleted doctypes.""" drop_doctypes = [] - modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") - doctype_link_field_map = _get_module_linked_doctype_field_map() for module_name in modules: print(f"Deleting Module '{module_name}'") From ba78852c73893fdf41c463539dbb19287f94cded Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 12 Oct 2021 17:15:12 +0530 Subject: [PATCH 77/80] docs: add docstring for import_file_by_path --- frappe/model/sync.py | 2 +- frappe/modules/import_file.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 6f829d6135..42bb16cbc2 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -70,7 +70,7 @@ def sync_for(app_name, force=0, reset_permissions=False): if l: for i, doc_path in enumerate(files): - import_file_by_path(doc_path, force=force, ignore_version=True, reset_permissions=reset_permissions, for_sync=True) + import_file_by_path(doc_path, force=force, ignore_version=True, reset_permissions=reset_permissions) frappe.db.commit() diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index f4179fb811..cf8ec46d76 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -63,7 +63,35 @@ def get_file_path(module, dt, dn): return path -def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, for_sync=False): + +def import_file_by_path(path: str,force: bool = False,data_import: bool = False,pre_process = None,ignore_version: bool = None,reset_permissions: bool = False): + """Import file from the given path + + Some conditions decide if a file should be imported or not. + Evaluation takes place in the order they are mentioned below. + + - Check if `force` is true. Import the file. If not, move ahead. + - Get `db_modified_timestamp`(value of the modified field in the database for the file). + If the return is `none,` this file doesn't exist in the DB, so Import the file. If not, move ahead. + - Check if there is a hash in DB for that file. If there is, Calculate the Hash of the file to import and compare it with the one in DB if they are not equal. + Import the file. If Hash doesn't exist, move ahead. + - Check if `db_modified_timestamp` is older than the timestamp in the file; if it is, we import the file. + + If timestamp comparison happens for doctypes, that means the Hash for it doesn't exist. + So, even if the timestamp is newer on DB (When comparing timestamps), we import the file and add the calculated Hash to the DB. + So in the subsequent imports, we can use hashes to compare. As a precautionary measure, the timestamp is updated to the current time as well. + + Args: + path (str): Path to the file. + force (bool, optional): Load the file without checking any conditions. Defaults to False. + data_import (bool, optional): [description]. Defaults to False. + pre_process ([type], optional): Any preprocesing that may need to take place on the doc. Defaults to None. + ignore_version (bool, optional): ignore current version. Defaults to None. + reset_permissions (bool, optional): reset permissions for the file. Defaults to False. + + Returns: + [bool]: True if import takes place. False if it wasn't imported. + """ frappe.flags.dt = frappe.flags.dt or [] try: docs = read_doc_from_file(path) From 35b242fe271b58a54756f6f2a75ce6e8bc110b73 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 17:33:18 +0530 Subject: [PATCH 78/80] test: remove app unit tests --- frappe/tests/test_commands.py | 49 ++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index ee184843ad..c048e23949 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -13,7 +13,7 @@ import glob # imports - module imports import frappe import frappe.recorder -from frappe.installer import add_to_installed_apps +from frappe.installer import add_to_installed_apps, remove_app from frappe.utils import add_to_date, get_bench_relative_path, now from frappe.utils.backups import fetch_latest_backups @@ -465,3 +465,50 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {site} set-admin-password test2") self.assertEqual(self.returncode, 0) self.assertEqual(check_password('Administrator', 'test2'), 'Administrator') + + +class RemoveAppUnitTests(unittest.TestCase): + def test_delete_modules(self): + from frappe.installer import ( + _delete_doctypes, + _delete_modules, + _get_module_linked_doctype_field_map, + ) + + test_module = frappe.new_doc("Module Def") + + test_module.update({"module_name": "RemoveThis", "app_name": "frappe"}) + test_module.save() + + module_def_linked_doctype = frappe.get_doc({ + "doctype": "DocType", + "name": "Doctype linked with module def", + "module": "RemoveThis", + "custom": 1, + "fields": [{ + "label": "Modulen't", + "fieldname": "notmodule", + "fieldtype": "Link", + "options": "Module Def" + }] + }).insert() + + doctype_to_link_field_map = _get_module_linked_doctype_field_map() + + self.assertIn("Report", doctype_to_link_field_map) + self.assertIn(module_def_linked_doctype.name, doctype_to_link_field_map) + self.assertEqual(doctype_to_link_field_map[module_def_linked_doctype.name], "notmodule") + self.assertNotIn("DocType", doctype_to_link_field_map) + + doctypes_to_delete = _delete_modules([test_module.module_name], dry_run=False) + self.assertEqual(len(doctypes_to_delete), 1) + + _delete_doctypes(doctypes_to_delete, dry_run=False) + self.assertFalse(frappe.db.exists("Module Def", test_module.module_name)) + self.assertFalse(frappe.db.exists("DocType", module_def_linked_doctype.name)) + + def test_dry_run(self): + """Check if dry run in not destructive.""" + + # nothing to assert, if this fails rest of the test suite will crumble. + remove_app("frappe", dry_run=True, yes=True, no_backup=True) From 08e5aa6afea01472c8709cb738516cdbbd2e8dc8 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 14 Oct 2021 09:55:14 +0530 Subject: [PATCH 79/80] revert: Override app link click to avoid page reload This PR reverts unnecessary change made in https://github.com/frappe/frappe/pull/14394 --- frappe/public/js/frappe/router.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 349eadffb0..cf132c82ea 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -56,6 +56,11 @@ $('body').on('click', 'a', function(e) { return override(e.currentTarget.hash); } + if (frappe.router.is_app_route(e.currentTarget.pathname)) { + // target has "/app, this is a v2 style route. + return override(e.currentTarget.pathname + e.currentTarget.hash); + } + }); frappe.router = { From 22ffe27217d25a7392cc9cfd0f1517719c048112 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 14 Oct 2021 11:00:46 +0530 Subject: [PATCH 80/80] fix: Permission check for default print format --- frappe/printing/doctype/print_format/print_format.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js index adc5e2363c..7b7009dbaf 100644 --- a/frappe/printing/doctype/print_format/print_format.js +++ b/frappe/printing/doctype/print_format/print_format.js @@ -36,7 +36,7 @@ frappe.ui.form.on("Print Format", { else if (frm.doc.custom_format && !frm.doc.raw_printing) { frm.set_df_property("html", "reqd", 1); } - if (frappe.perm.has_perm('DocType', 0, 'read', frm.doc.doc_type)) { + if (frappe.model.can_read(frm.doc.doc_type)) { frappe.db.get_value('DocType', frm.doc.doc_type, 'default_print_format', (r) => { if (r.default_print_format != frm.doc.name) { frm.add_custom_button(__("Set as Default"), function () {