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

Merge branch 'develop' into delete-standard-workspace-fix

Browse source
This commit is contained in:
Shariq Ansari 2023-01-07 17:57:22 +05:30 • committed by GitHub
commit 056d8e0368
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/desk/doctype/workspace/workspace.json
View file

@ -196,15 +196,6 @@
"role": "Workspace Manager",
"share": 1,
"write": 1
},
{
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "All",
"share": 1
}
],
"sort_field": "modified",

13
frappe/desk/doctype/workspace/workspace.py
View file

@ -194,7 +194,7 @@ def save_page(title, public, new_widgets, blocks):
if not public:
filters = {"for_user": frappe.session.user, "label": title + "-" + frappe.session.user}
pages = frappe.get_list("Workspace", filters=filters)
pages = frappe.get_all("Workspace", filters=filters)
if pages:
doc = frappe.get_doc("Workspace", pages[0])
@ -209,12 +209,8 @@ def save_page(title, public, new_widgets, blocks):
@frappe.whitelist()
def update_page(name, title, icon, parent, public):
public = frappe.parse_json(public)
doc = frappe.get_doc("Workspace", name)
filters = {"parent_page": doc.title, "public": doc.public}
child_docs = frappe.get_list("Workspace", filters=filters)
if doc:
doc.title = title
doc.icon = icon
@ -230,6 +226,9 @@ def update_page(name, title, icon, parent, public):
rename_doc("Workspace", name, new_name, force=True, ignore_permissions=True)
# update new name and public in child pages
child_docs = frappe.get_all(
"Workspace", filters={"parent_page": doc.title, "public": doc.public}
)
if child_docs:
for child in child_docs:
child_doc = frappe.get_doc("Workspace", child.name)
@ -338,7 +337,7 @@ def last_sequence_id(doc):
if not doc_exists:
return 0
return frappe.db.get_list(
return frappe.get_all(
"Workspace",
fields=["sequence_id"],
filters={"public": doc.public, "for_user": doc.for_user},
@ -347,7 +346,7 @@ def last_sequence_id(doc):
def get_page_list(fields, filters):
return frappe.get_list("Workspace", fields=fields, filters=filters, order_by="sequence_id asc")
return frappe.get_all("Workspace", fields=fields, filters=filters, order_by="sequence_id asc")
def is_workspace_manager():

3
frappe/public/js/frappe/views/workspace/workspace.js
View file

@ -448,10 +448,11 @@ frappe.views.Workspace = class Workspace {
frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" });
});
page.name &&
if (page.name && frappe.perm.has_perm("Workspace", 0, "read")) {
this.page.add_inner_button(__("Settings"), () => {
frappe.set_route(`workspace/${page.name}`);
});
}
}
show_sidebar_actions() {