From 637b224c9c491fce8e1158db6a69117170eaf13d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 May 2017 17:21:41 +0530 Subject: [PATCH 1/3] Reload Role doctype --- frappe/patches.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 1b2dab39a2..ad04e56367 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -20,7 +20,7 @@ execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16 frappe.patches.v7_2.setup_custom_perms #2017-01-19 frappe.patches.v8_0.set_user_permission_for_page_and_report #2017-03-20 -execute:frappe.reload_doc('core', 'doctype', 'role') +execute:frappe.reload_doc('core', 'doctype', 'role') #2017-05-23 execute:frappe.reload_doc('core', 'doctype', 'user') execute:frappe.reload_doc('custom', 'doctype', 'custom_field') #2015-10-19 execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26 From 1aeb5638798dffd06386d247c1681400c24bd040 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 23 May 2017 21:03:08 +0530 Subject: [PATCH 2/3] Fix sort_selector (#3372) * Fix sort_selector * early return if no meta --- frappe/public/js/frappe/ui/sort_selector.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/sort_selector.js b/frappe/public/js/frappe/ui/sort_selector.js index 77e2204a5b..73076665c5 100644 --- a/frappe/public/js/frappe/ui/sort_selector.js +++ b/frappe/public/js/frappe/ui/sort_selector.js @@ -90,6 +90,7 @@ frappe.ui.SortSelector = Class.extend({ setup_from_doctype: function() { var me = this; var meta = frappe.get_meta(this.doctype); + if (!meta) return; var { meta_sort_field, meta_sort_order } = this.get_meta_sort_field(); @@ -155,6 +156,14 @@ frappe.ui.SortSelector = Class.extend({ }, get_meta_sort_field: function() { var meta = frappe.get_meta(this.doctype); + + if (!meta) { + return { + meta_sort_field: null, + meta_sort_order: null + } + } + if(meta.sort_field && meta.sort_field.includes(',')) { var parts = meta.sort_field.split(',')[0].split(' '); return { @@ -176,4 +185,4 @@ frappe.ui.SortSelector = Class.extend({ || frappe.meta.get_label(this.doctype, fieldname); } } -}) \ No newline at end of file +}) From 6a6ac94ec99ea084f52486e7bfe4088535345cbe Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 May 2017 21:37:46 +0600 Subject: [PATCH 3/3] bumped to version 8.0.58 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 15a89c8c21..a611e7e47a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.57' +__version__ = '8.0.58' __title__ = "Frappe Framework" local = Local()