Merge branch 'v4.x.x'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "4.13.3"
+__version__ = "4.13.4"

frappe/app.py

@@ -143,11 +143,11 @@ def serve(port=8000, profile=False, site=None, sites_path='.'):
 
 	if not os.environ.get('NO_STATICS'):
 		application = SharedDataMiddleware(application, {
-			'/assets': os.path.join(sites_path, 'assets'),
+			b'/assets': os.path.join(sites_path, 'assets').encode("utf-8"),
 		})
 
 		application = StaticDataMiddleware(application, {
-			'/files': os.path.abspath(sites_path)
+			b'/files': os.path.abspath(sites_path).encode("utf-8")
 		})
 
 	run_simple('0.0.0.0', int(port), application, use_reloader=True,

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.13.3"
+app_version = "4.13.4"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/model/db_query.py

@@ -248,7 +248,7 @@ class DatabaseQuery(object):
 			# get user permissions
 			user_permissions = frappe.defaults.get_user_permissions(self.user)
 			self.add_user_permissions(user_permissions,
-				user_permission_doctypes=role_permissions.get("user_permission_doctypes"))
+				user_permission_doctypes=role_permissions.get("user_permission_doctypes").get("read"))
 
 		if as_condition:
 			conditions = ""

frappe/permissions.py

@@ -93,10 +93,9 @@ def get_role_permissions(meta, user=None):
 						perms["apply_user_permissions"][ptype] = (perms["apply_user_permissions"].get(ptype, 1)
 							and p.get("apply_user_permissions"))
 
-				if p.apply_user_permissions:
+				if p.apply_user_permissions and p.user_permission_doctypes:
 					# set user_permission_doctypes in perms
-					user_permission_doctypes = (json.loads(p.user_permission_doctypes)
-							if p.user_permission_doctypes else None)
+					user_permission_doctypes = json.loads(p.user_permission_doctypes)
 
 					if user_permission_doctypes:
 						# perms["user_permission_doctypes"][ptype] would be a list of list like [["User", "Blog Post"], ["User"]]

frappe/public/js/frappe/model/perm.js

@@ -86,14 +86,20 @@ $.extend(frappe.perm, {
 
 				if (permlevel===0 && cint(p.apply_user_permissions) && p.user_permission_doctypes) {
 					// set user_permission_doctypes in perms
-					var user_permission_doctypes = p.user_permission_doctypes
-						? JSON.parse(p.user_permission_doctypes) : null;
+					var user_permission_doctypes = JSON.parse(p.user_permission_doctypes);
 
 					if (user_permission_doctypes && user_permission_doctypes.length) {
 						if (!perm[permlevel]["user_permission_doctypes"]) {
-							perm[permlevel]["user_permission_doctypes"] = [];
+							perm[permlevel]["user_permission_doctypes"] = {};
 						}
-						perm[permlevel]["user_permission_doctypes"].push(user_permission_doctypes);
+
+						$.each(frappe.perm.rights, function(i, key) {
+							if (!perm[permlevel]["user_permission_doctypes"][key]) {
+								perm[permlevel]["user_permission_doctypes"][key] = [];
+							}
+
+							perm[permlevel]["user_permission_doctypes"][key].push(user_permission_doctypes);
+						});
 					}
 				}
 			}
@@ -127,7 +133,7 @@ $.extend(frappe.perm, {
 
 		var user_permissions = frappe.defaults.get_user_permissions();
 		if(user_permissions && !$.isEmptyObject(user_permissions)) {
-			var user_permission_doctypes = me.get_user_permission_doctypes(perm[0].user_permission_doctypes,
+			var user_permission_doctypes = me.get_user_permission_doctypes(perm[0].user_permission_doctypes[ptype],
 				user_permissions);
 
 			$.each(user_permission_doctypes, function(i, doctypes) {

frappe/utils/file_manager.py

@@ -6,7 +6,7 @@ import frappe
 import os, base64, re
 import hashlib
 import mimetypes
-from frappe.utils import get_site_path, get_hook_method, get_files_path, random_string
+from frappe.utils import get_site_path, get_hook_method, get_files_path, random_string, encode, cstr
 from frappe import _
 from frappe import conf
 from copy import copy
@@ -258,8 +258,11 @@ def get_content_hash(content):
 	return hashlib.md5(content).hexdigest()
 
 def get_file_name(fname, optional_suffix):
+	# convert to unicode
+	fname = cstr(fname)
+
 	n_records = frappe.db.sql("select name from `tabFile Data` where file_name=%s", fname)
-	if len(n_records) > 0 or os.path.exists(get_files_path(fname).encode('utf-8')):
+	if len(n_records) > 0 or os.path.exists(encode(get_files_path(fname))):
 		f = fname.rsplit('.', 1)
 		if len(f) == 1:
 			partial, extn = f[0], ""

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.13.3"
+version = "4.13.4"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()