From 77f9ee0688c34cee69b96a7520b0c73c9024c828 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 26 Apr 2017 11:18:05 +0530 Subject: [PATCH 1/3] Removed single doctypes from User Permissions --- frappe/core/page/user_permissions/user_permissions.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/user_permissions/user_permissions.py b/frappe/core/page/user_permissions/user_permissions.py index 3c5920e47a..98d7e90095 100644 --- a/frappe/core/page/user_permissions/user_permissions.py +++ b/frappe/core/page/user_permissions/user_permissions.py @@ -72,11 +72,15 @@ def add(user, defkey, defvalue): def get_doctypes_for_user_permissions(): '''Get doctypes for the current user where user permissions are applicable''' user_roles = frappe.get_roles() + if "System Manager" in user_roles: - return sorted(set([p.parent for p in get_valid_perms()])) + doctypes = set([p.parent for p in get_valid_perms()]) else: - return sorted(set([p.parent for p in get_valid_perms() if p.set_user_permissions])) + doctypes = set([p.parent for p in get_valid_perms() if p.set_user_permissions]) + single_doctypes = set([d.name for d in frappe.get_all("DocType", {"issingle": 1})]) + + return sorted(doctypes.difference(single_doctypes)) @frappe.whitelist() From 3ddcbc6d5eeb0cdcad246b870d57ede89e32bec3 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Tue, 25 Apr 2017 18:38:15 +0530 Subject: [PATCH 2/3] [minor] don't show reply link if the timeline message was send by current user --- frappe/public/js/frappe/form/footer/timeline_item.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html index ba3e0dadb9..639b2f7047 100755 --- a/frappe/public/js/frappe/form/footer/timeline_item.html +++ b/frappe/public/js/frappe/form/footer/timeline_item.html @@ -73,7 +73,7 @@ {% } %} - {% if (data.communication_medium === "Email") { %} + {% if (data.communication_medium === "Email" && data.sender !== user_email) { %} {%= __("Reply") %} {% } %} From 5448d2f1868c3bc2c743e7b737c0600f61cf9598 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 26 Apr 2017 15:15:03 +0600 Subject: [PATCH 3/3] bumped to version 8.0.26 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 74c38748cf..8142f8910e 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.25' +__version__ = '8.0.26' __title__ = "Frappe Framework" local = Local()