From 9a23f808ffb912d6f5b5271267e791ba21de6b57 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 26 Jan 2017 20:37:41 +0530 Subject: [PATCH 1/3] [minor] allow all roles for permission manager --- frappe/core/page/permission_manager/permission_manager.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py index f0273e20d8..a0598ea46d 100644 --- a/frappe/core/page/permission_manager/permission_manager.py +++ b/frappe/core/page/permission_manager/permission_manager.py @@ -15,9 +15,7 @@ def get_roles_and_doctypes(): send_translations(frappe.get_lang_dict("doctype", "DocPerm")) return { "doctypes": [d[0] for d in frappe.db.sql("""select name from `tabDocType` dt where - istable=0 and - name not in ('DocType') and - exists(select * from `tabDocPerm` dp,`tabRole` role where dp.role = role.name and dp.parent=dt.name and not role.disabled)""")], + istable=0 and name not in ('DocType')""")], "roles": [d[0] for d in frappe.db.sql("""select name from tabRole where name != 'Administrator' and disabled=0""")] } From 3249272852630db8e928b99d529a4f314c125313 Mon Sep 17 00:00:00 2001 From: KanchanChauhan Date: Fri, 27 Jan 2017 11:25:46 +0530 Subject: [PATCH 2/3] [Fix]Linked with not found (#2635) --- frappe/public/js/frappe/form/linked_with.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/linked_with.js b/frappe/public/js/frappe/form/linked_with.js index 449ec26edd..f04c7d89f5 100644 --- a/frappe/public/js/frappe/form/linked_with.js +++ b/frappe/public/js/frappe/form/linked_with.js @@ -52,12 +52,13 @@ frappe.ui.form.LinkedWith = Class.extend({ var me = this; var already_loaded = Object.keys(locals.DocType); var doctypes_to_load = []; - $.each(Object.keys(me.frm.__linked_doctypes), function(i, v) { - if (already_loaded.indexOf(v)===-1) { - doctypes_to_load.push(v); - } - }); - + if (me.frm.__linked_doctypes) { + $.each(Object.keys(me.frm.__linked_doctypes), function(i, v) { + if (already_loaded.indexOf(v)===-1) { + doctypes_to_load.push(v); + } + }); + } // load all doctypes sequentially using with_doctype return $.when.apply($, $.map(doctypes_to_load, function(dt) { return frappe.model.with_doctype(dt, function() { From 6487604ca77e8f592580e9c3cfde1b913c597d5f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 27 Jan 2017 16:06:18 +0600 Subject: [PATCH 3/3] bumped to version 7.2.14 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 9bfff8257c..1681f6891b 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__ = '7.2.13' +__version__ = '7.2.14' __title__ = "Frappe Framework" local = Local()