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.

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

fix: Org Chart fixes (backport #27290) #46183

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 28, 2025

Before:

If there are multiple root nodes with descendants, only the first root and all it's descendants were getting expanded on clicking Expand All:

image

After:

image

Before:

The HR breadcrumb was added from the hierarchy chart class which is meant to be a generic class.

After:

Shifted frappe.breadcrumbs.add('HR') to org chart page file instead.


This is an automatic backport of pull request #27290 done by Mergify.

* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes

(cherry picked from commit f828d85)

# Conflicts:
#	erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
#	erpnext/utilities/hierarchy_chart.py
Copy link
Contributor Author

mergify bot commented Feb 28, 2025

Cherry-pick of f828d85 has failed:

On branch mergify/bp/version-13-hotfix/pr-27290
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit f828d853e3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
	both modified:   erpnext/utilities/hierarchy_chart.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant