Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release v13 #21083

Merged
merged 4 commits into from
May 23, 2023
Merged

chore: release v13 #21083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1557d68
fix: frappe.get_palette when text is undefined (#21033) (#21034)
mergify[bot] May 17, 2023
6c57a26
fix: using 'Equals' and 'Is' on multiselect throws error
ruthra-kumar May 18, 2023
5339cf4
Merge pull request #21050 from frappe/mergify/bp/version-13-hotfix/pr…
phot0n May 18, 2023
a9acf3f
fix: incorrect caching of `is_owner` permissions (#21048) (#21052)
mergify[bot] May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions frappe/desk/reportview.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading