From d0a2fea6320c7a64755fef6994699a3f33c571a9 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 9 Aug 2019 12:43:39 +0530 Subject: [PATCH 1/7] fix: allow to select child doctype in user permissions --- .../core/doctype/user_permission/user_permission.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py index 8c1dd51be3..fadb922331 100644 --- a/frappe/core/doctype/user_permission/user_permission.py +++ b/frappe/core/doctype/user_permission/user_permission.py @@ -120,8 +120,15 @@ def user_permission_exists(user, allow, for_value, applicable_for=None): return has_same_user_permission def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters): - linked_doctypes = get_linked_doctypes(doctype, True).keys() - linked_doctypes = list(linked_doctypes) + linked_doctypes_map = get_linked_doctypes(doctype, True) + + linked_doctypes = [] + for linked_doctype, linked_doctype_values in linked_doctypes_map.items(): + linked_doctypes.append(linked_doctype) + child_doctype = linked_doctype_values.get("child_doctype") + if child_doctype: + linked_doctypes.append(child_doctype) + linked_doctypes += [doctype] if txt: From 52c516c0e19e3fcd12414d92b85a9b684248db1a Mon Sep 17 00:00:00 2001 From: Maximilian Federle Date: Tue, 13 Aug 2019 11:57:10 +0200 Subject: [PATCH 2/7] fix: Always use field.fieldname in preview_fields If building preview_fields from mandatory fields in get_preview_data, use the correct property "fieldname" instead of "name". If not, subsequent db queries will fail with illegal column names. --- frappe/desk/link_preview.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py index 402883a3ad..f380f96e26 100644 --- a/frappe/desk/link_preview.py +++ b/frappe/desk/link_preview.py @@ -13,7 +13,7 @@ def get_preview_data(doctype, docname): # no preview fields defined, build list from mandatory fields if not preview_fields: - preview_fields = [field.name for field in meta.fields if field.reqd] + preview_fields = [field.fieldname for field in meta.fields if field.reqd] title_field = meta.get_title_field() image_field = meta.image_field @@ -40,4 +40,4 @@ def get_preview_data(doctype, docname): if val and meta.has_field(key) and key not in [image_field, title_field, 'name']: formatted_preview_data[meta.get_field(key).label] = frappe.format(val, meta.get_field(key).fieldtype) - return formatted_preview_data \ No newline at end of file + return formatted_preview_data From 75fa52d0bed36ca621fc028924a524a310b5aafc Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Fri, 16 Aug 2019 09:38:37 +0530 Subject: [PATCH 3/7] fix: trigger primary function on btn-new-doc --- frappe/public/js/frappe/list/list_view.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 034cd91b42..4209899bd3 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -984,7 +984,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } setup_new_doc_event() { - this.$no_result.find('.btn-new-doc').click(() => this.make_new_doc()); + this.$no_result.find('.btn-new-doc').click(() => { + if (this.settings.primary_action) { + this.settings.primary_action(); + } else { + this.make_new_doc(); + } + }); } setup_tag_event() { From 4353d21f2e5c781854cea029b6df01819a74a664 Mon Sep 17 00:00:00 2001 From: Govind S Menokee Date: Fri, 16 Aug 2019 15:42:53 +0530 Subject: [PATCH 4/7] fix: Menu items not clickable (#8090) Correct the z-index of the .dropdown-backdrop --- frappe/public/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/css/bootstrap.css b/frappe/public/css/bootstrap.css index c4db43f199..a8e6c87cda 100644 --- a/frappe/public/css/bootstrap.css +++ b/frappe/public/css/bootstrap.css @@ -3494,7 +3494,7 @@ tbody.collapse.in { right: 0; bottom: 0; left: 0; - z-index: 990; + z-index: 99; } .pull-right > .dropdown-menu { right: 0; From 62a04d8efda974cbe45df411161f6be5613f6b02 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Sat, 17 Aug 2019 23:05:29 +0530 Subject: [PATCH 5/7] fix(dashboard): Only show valid options for time_interval --- .../desk/doctype/dashboard_chart/dashboard_chart.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 38635daebe..f42faea0e5 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -36,6 +36,18 @@ frappe.ui.form.on('Dashboard Chart', { frm.trigger('update_options'); }, + timespan: function(frm) { + const time_interval_options = { + "Last Year": ["Quarterly", "Monthly", "Weekly", "Daily"], + "Last Quarter": ["Monthly", "Weekly", "Daily"], + "Last Month": ["Weekly", "Daily"], + "Last Week": ["Daily"] + }; + if (frm.doc.timespan) { + frm.set_df_property('time_interval', 'options', time_interval_options[frm.doc.timespan]); + } + }, + update_options: function(frm) { let doctype = frm.doc.document_type; let date_fields = [ From f9b5a2ccb348e7a53ec49a3210c4fb3220bf727b Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 19 Aug 2019 09:09:50 +0530 Subject: [PATCH 6/7] fix: Dropdown menu not working on mobile --- frappe/public/less/common.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 9670f62138..37a36b772f 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -107,6 +107,10 @@ kbd { /* dropdowns */ +.dropdown-backdrop { + display: none; +} + .dropdown-menu > li > a { padding: 14px; white-space: normal; From 2ab425e2668c729686f6656b981a64c210182232 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Tue, 20 Aug 2019 16:19:28 +0550 Subject: [PATCH 7/7] bumped to version 12.0.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 57ddbc9aae..ce03a6a704 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '12.0.6' +__version__ = '12.0.7' __title__ = "Frappe Framework" local = Local()