Merge branch 'hotfix'

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()

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

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);
 		}
 	}
-})
+})