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: allow creation of workspace based on desk user role perms (backport #26617) #26659

Merged
merged 2 commits into from
Jun 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Currently, there is no way of restricting the creation of Workspaces depending on certain roles and permissions.

Adds the ability to check and restrict Workspace creation only to configured roles.


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

(cherry picked from commit 61807dd)

# Conflicts:
#	frappe/desk/doctype/workspace/workspace.json
@mergify mergify bot added the conflicts label Jun 4, 2024
@mergify mergify bot requested review from a team and akhilnarang and removed request for a team June 4, 2024 04:09
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 61807dd has failed:

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

You are currently cherry-picking commit 61807dda71.
  (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)

Changes to be committed:
	modified:   frappe/desk/desktop.py
	modified:   frappe/desk/doctype/workspace/workspace.py
	modified:   frappe/public/js/frappe/views/workspace/workspace.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/doctype/workspace/workspace.json

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

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label Jun 4, 2024
@GursheenK GursheenK merged commit a05d9b6 into version-15-hotfix Jun 4, 2024
18 checks passed
@GursheenK GursheenK deleted the mergify/bp/version-15-hotfix/pr-26617 branch June 4, 2024 04:56
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.29.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
add-test-cases Add test case to validate fix or enhancement released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants