Skip to content

Commit

Permalink
Merge pull request #21083 from frappe/version-13-hotfix
Browse files Browse the repository at this point in the history
chore: release v13
  • Loading branch information
phot0n committed May 23, 2023
2 parents 42a0acb + a9acf3f commit 8b4a197
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions frappe/desk/reportview.py
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,7 @@ def get_filters_cond(
if isinstance(f[1], string_types) and f[1][0] == "!":
flt.append([doctype, f[0], "!=", f[1][1:]])
elif isinstance(f[1], (list, tuple)) and f[1][0].lower() in (
"=",
">",
"<",
">=",
Expand All @@ -697,6 +698,7 @@ def get_filters_cond(
"in",
"not in",
"between",
"is",
):

flt.append([doctype, f[0], f[1][0], f[1][1]])
Expand Down
2 changes: 1 addition & 1 deletion frappe/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def get_role_permissions(doctype_meta, user=None, is_owner=None):
if not user:
user = frappe.session.user

cache_key = (doctype_meta.name, user)
cache_key = (doctype_meta.name, user, bool(is_owner))

if user == "Administrator":
return allow_everything()
Expand Down
1 change: 1 addition & 0 deletions frappe/public/js/frappe/utils/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ frappe.palette = [
];

frappe.get_palette = function (txt) {
if (!txt) return frappe.palette[8]; // breaks when undefined
var idx = cint((parseInt(md5(txt).substr(4, 2), 16) + 1) / 5.33);
return frappe.palette[idx % 8];
}
Expand Down

0 comments on commit 8b4a197

Please sign in to comment.