From 7656d8b82164d1b29a864c109bbc5aa2ed9b238c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 13 Dec 2016 19:36:09 +0530 Subject: [PATCH 1/3] [fix][minor] dpctype as kargs to has_permissions --- frappe/__init__.py | 2 +- frappe/website/doctype/web_form/web_form.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 974475d7ca..10f0c9ebfb 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -489,7 +489,7 @@ def has_permission(doctype=None, ptype="read", doc=None, user=None, verbose=Fals return out -def has_website_permission(doc=None, ptype='read', user=None, verbose=False): +def has_website_permission(doc=None, ptype='read', user=None, verbose=False, doctype=None): """Raises `frappe.PermissionError` if not permitted. :param doctype: DocType for which permission is to be check. diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 3bdce247ad..ac1299d345 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -422,7 +422,7 @@ def has_web_form_permission(doctype, name, ptype='read'): elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user: return True - elif frappe.has_website_permission(name, ptype=ptype): + elif frappe.has_website_permission(name, ptype=ptype, doctype=doctype): return True elif check_webform_perm(doctype, name): From 8f60e0dd8e558bd26f7828f19a4d4837ac205e1d Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 14 Dec 2016 17:23:04 +0530 Subject: [PATCH 2/3] [fix] anchor click fix for tree --- frappe/public/js/frappe/ui/tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js index 847807119d..d058cc1d50 100644 --- a/frappe/public/js/frappe/ui/tree.js +++ b/frappe/public/js/frappe/ui/tree.js @@ -84,7 +84,7 @@ frappe.ui.TreeNode = Class.extend({ $(icon_html + ' ' + this.get_label() + ""). appendTo(this.$a); - this.$a.find('i').click(function() { + this.$a.find('i, a').click(function() { setTimeout(function() { me.toolbar.find(".btn-expand").click(); }, 100); }); }, From f1633408f0c861f06dcf3c9a24ea8d3a21483989 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 15 Dec 2016 17:06:44 +0600 Subject: [PATCH 3/3] bumped to version 7.1.26 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 10f0c9ebfb..691a99c4ad 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.1.25' +__version__ = '7.1.26' __title__ = "Frappe Framework" local = Local()