vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'staging' into develop

Browse source
This commit is contained in:
Frappe Bot 2018-12-26 12:58:04 +00:00
commit fec8631fe5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/hooks.py
View file

@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.41'
staging_version = '11.0.3-beta.42'
app_email = "info@frappe.io"

6
frappe/patches/v11_0/remove_skip_for_doctype.py
View file

@ -42,7 +42,9 @@ def execute():
# only specific doctypes are selected
# split this into multiple records and delete
linked_doctypes = get_linked_doctypes(user_permission.allow, True).keys()
linked_doctypes = list(linked_doctypes)
# append the doctype for which we have build the user permission
linked_doctypes += [user_permission.allow]
@ -79,4 +81,4 @@ def execute():
frappe.db.sql('DELETE FROM `tabUser Permission` WHERE `name` in ({})' # nosec
.format(','.join(['%s'] * len(user_permissions_to_delete))),
tuple(user_permissions_to_delete)
)
)