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

fix: Ignoring linked doctypes on cancel

Browse source
This commit is contained in:
Deepesh Garg 2025-01-03 18:23:20 +05:30
parent 00b3e05828
commit d2e4d63c8f
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/desk/form/linked_with.py
View file

@ -14,18 +14,18 @@ from frappe.modules import load_doctype_module
@frappe.whitelist()
def get_submitted_linked_docs(doctype: str, name: str) -> list[tuple]:
def get_submitted_linked_docs(doctype: str, name: str, ignore_doctypes_on_cancel_all=None) -> list[tuple]:
"""Get all the nested submitted documents those are present in referencing tables (dependent tables).
:param doctype: Document type
:param name: Name of the document
Usecase:
Use-case:
* User should be able to cancel the linked documents along with the one user trying to cancel.
Case1: If document sd1-n1 (document name n1 from sumittable doctype sd1) is linked to sd2-n2 and sd2-n2 is linked to sd3-n3,
Case1: If document sd1-n1 (document name n1 from submittable doctype sd1) is linked to sd2-n2 and sd2-n2 is linked to sd3-n3,
Getting submittable linked docs of `sd1-n1`should give both sd2-n2 and sd3-n3.
Case2: If document sd1-n1 (document name n1 from sumittable doctype sd1) is linked to d2-n2 and d2-n2 is linked to sd3-n3,
Case2: If document sd1-n1 (document name n1 from submittable doctype sd1) is linked to d2-n2 and d2-n2 is linked to sd3-n3,
Getting submittable linked docs of `sd1-n1`should give None. (because d2-n2 is not a submittable doctype)
Case3: If document sd1-n1 (document name n1 from submittable doctype sd1) is linked to d2-n2 & sd2-n2. d2-n2 is linked to sd3-n3.
Getting submittable linked docs of `sd1-n1`should give sd2-n2.
@ -38,9 +38,13 @@ def get_submitted_linked_docs(doctype: str, name: str) -> list[tuple]:
3. Searching for links is going to be a tree like structure where at every level,
you will be finding documents using parent document and parent document links.
"""
if isinstance(ignore_doctypes_on_cancel_all, str):
ignore_doctypes_on_cancel_all = json.loads(ignore_doctypes_on_cancel_all)
frappe.has_permission(doctype, doc=name)
tree = SubmittableDocumentTree(doctype, name)
visited_documents = tree.get_all_children()
visited_documents = tree.get_all_children(ignore_doctypes_on_cancel_all)
docs = []
for dt, names in visited_documents.items():
@ -69,7 +73,7 @@ class SubmittableDocumentTree:
self._submittable_doctypes = None # All submittable doctypes in the system
self._references_across_doctypes = None # doctype wise links/references
def get_all_children(self):
def get_all_children(self, ignore_doctypes_on_cancel_all):
"""Get all nodes of a tree except the root node (all the nested submitted
documents those are present in referencing tables dependent tables).
"""
@ -77,7 +81,7 @@ class SubmittableDocumentTree:
next_level_children = defaultdict(list)
for parent_dt in list(self.to_be_visited_documents):
parent_docs = self.to_be_visited_documents.get(parent_dt)
if not parent_docs:
if not parent_docs or (ignore_doctypes_on_cancel_all and parent_dt in ignore_doctypes_on_cancel_all):
del self.to_be_visited_documents[parent_dt]
continue

4
frappe/public/js/frappe/form/form.js
View file

@ -913,6 +913,7 @@ frappe.ui.form.Form = class FrappeForm {
args: {
doctype: me.doc.doctype,
name: me.doc.name,
ignore_doctypes_on_cancel_all: me.ignore_doctypes_on_cancel_all,
},
freeze: true,
})
@ -922,9 +923,6 @@ frappe.ui.form.Form = class FrappeForm {
.map((value) => {
return value.doctype;
})
.filter((value) => {
return !me.ignore_doctypes_on_cancel_all.includes(value);
});
if (doctypes_to_cancel.length) {
return me._cancel_all(r, btn, callback, on_error);