From c164aac93302b1ffa9d8459fbdbaff0b24d08482 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 5 Nov 2018 12:53:34 +0530 Subject: [PATCH 1/5] Datatable Upgrade --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 984b382c6f..2516080f38 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "awesomplete": "^1.1.2", "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^1.5.0", + "frappe-datatable": "^1.5.3", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index cff0ffc035..9ac6f4e30d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1219,10 +1219,10 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.0.tgz#eea78a87e799876b71e58dbdc128fd9badb5e2c6" - integrity sha512-h9yP33UqRcEfcs5FVSFFUigya/KT5qFrB1vOqayhxqPoxdVH2pGKi+Qh/BO5KRNd6uVk8rVwXMhA8A9TU+2uEg== +frappe-datatable@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.3.tgz#f60e619a92b77b60cdbb8376e521398a2933995a" + integrity sha512-1sEcnOUxN+vI5BgrPJPNJNc72kAX4RQRNBJjR2RWVotczIE+YJZ4e8M1k6d4xXFWOj687qD9wha7uveSKy2jkQ== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From 5aa9dbf6ee4e44253225e211861302ab44bca93a Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 5 Nov 2018 18:35:29 +0530 Subject: [PATCH 2/5] fix: Dynamic Link filter in listview (#6405) --- frappe/public/js/frappe/form/controls/dynamic_link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js index f62f1432fe..02e970091e 100644 --- a/frappe/public/js/frappe/form/controls/dynamic_link.js +++ b/frappe/public/js/frappe/form/controls/dynamic_link.js @@ -13,7 +13,7 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ let input = null; if (cur_list) { // for list page - input = cur_list.wrapper.find(selector); + input = cur_list.filter_area.standard_filters_wrapper.find(selector); } if (cur_page) { input = $(cur_page.page).find(selector); From fc7a4a78357dec629d565423c786385b56246b0e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 5 Nov 2018 18:35:44 +0530 Subject: [PATCH 3/5] fix(listview): Smart parsing of route options (#6404) - Fieldname should also be searched in child tables --- frappe/public/js/frappe/list/list_view.js | 30 +++++++++-------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 11c60e45b1..a5b214ef0b 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -50,18 +50,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { if (frappe.route_options) { // Priority 1: route filters - let filters = []; - for (let key in frappe.route_options) { - let value = frappe.route_options[key]; - if (value.startsWith('[') && value.endsWith(']')) { - value = JSON.parse(value); - } else { - value = ['=', value]; - } - filters.push([this.doctype, key, ...value]) - } - this.filters = filters; - frappe.route_options = null; + this.filters = this.parse_filters_from_route_options(); } else if (this.view_user_settings.filters) { // Priority 2: saved filters const saved_filters = this.view_user_settings.filters; @@ -1126,11 +1115,17 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { return actions_menu_items; } - set_filters_from_route_options() { + parse_filters_from_route_options() { const filters = []; + for (let field in frappe.route_options) { - var value = frappe.route_options[field]; - var doctype = null; + + let doctype = null; + let value = frappe.route_options[field]; + + if (value.startsWith('[') && value.endsWith(']')) { + value = JSON.parse(value); + } // if `Child DocType.fieldname` if (field.includes('.')) { @@ -1157,10 +1152,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } frappe.route_options = null; - this.filter_area.clear(false) - .then(() => { - this.filter_area.add(filters); - }); + return filters; } static trigger_list_update(data) { From 6381c84ffd416e39db9d89c3c7912fd7aa672447 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 6 Nov 2018 12:44:25 +0530 Subject: [PATCH 4/5] [Fix] User listview is not working becaause full name field is hidden --- frappe/core/doctype/user/user.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json index 4eb5e943ab..0ddcd17577 100644 --- a/frappe/core/doctype/user/user.json +++ b/frappe/core/doctype/user/user.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_events_in_timeline": 0, "allow_guest_to_view": 0, "allow_import": 1, "allow_rename": 1, @@ -252,7 +253,7 @@ "columns": 0, "fieldname": "full_name", "fieldtype": "Data", - "hidden": 1, + "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -266,7 +267,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -2206,7 +2207,7 @@ "istable": 0, "max_attachments": 5, "menu_index": 0, - "modified": "2018-09-28 16:34:06.215199", + "modified": "2018-11-06 12:41:33.864058", "modified_by": "Administrator", "module": "Core", "name": "User", @@ -2259,5 +2260,6 @@ "sort_order": "DESC", "title_field": "full_name", "track_changes": 1, - "track_seen": 0 + "track_seen": 0, + "track_views": 0 } \ No newline at end of file From aa26e39da02a00b1cf37b80171a518b87d4fac15 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 6 Nov 2018 11:05:32 +0000 Subject: [PATCH 5/5] bumped to version 11.0.3-beta.22 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 9247f337e2..a78ce3f7eb 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.21' +staging_version = '11.0.3-beta.22' app_email = "info@frappe.io"