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

feat: Allow Setting email, share and print perms via User Type (backport #27096) #27160

Merged
merged 2 commits into from
Jul 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2024

no-docs (https://docs.erpnext.com/docs/user/manual/en/limited-user does not go into perm details)

Feature

  • Allow setting additional Permissions (share, print and email) in User Type. They default to 1 for backward compatability. Now users can explicitly control these values.
    Screenshot 2024-07-12 at 6 29 59 PM

Fix

  • "New Email" button is visible in timeline even if user has no email access. It throws an error on clicking the button. And then again on trying to send the email anyway.
    Screenshot 2024-07-12 at 6 35 29 PM
  • Fix (hide the button if user does have email perm to avoid misleading UX) :
    Screenshot 2024-07-12 at 6 34 07 PM

This is an automatic backport of pull request #27096 done by [Mergify](https://mergify.com).

- misc: Also hide email button if user does not have email perm on doctype (the btn in the menu is already taken care of)

(cherry picked from commit cde3d0d)

# Conflicts:
#	frappe/core/doctype/user_document_type/user_document_type.json
#	frappe/core/doctype/user_document_type/user_document_type.py
#	frappe/core/doctype/user_type/user_type.py
#	frappe/public/js/frappe/form/footer/form_timeline.js
@mergify mergify bot added the conflicts label Jul 18, 2024
Copy link
Contributor Author

mergify bot commented Jul 18, 2024

Cherry-pick of cde3d0d has failed:

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

You are currently cherry-picking commit cde3d0dfda.
  (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/core/doctype/user_type/test_user_type.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user_document_type/user_document_type.json
	both modified:   frappe/core/doctype/user_document_type/user_document_type.py
	both modified:   frappe/core/doctype/user_type/user_type.py
	both modified:   frappe/public/js/frappe/form/footer/form_timeline.js

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

@akhilnarang akhilnarang merged commit 944f342 into version-14-hotfix Jul 31, 2024
10 of 11 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-14-hotfix/pr-27096 branch July 31, 2024 07:06
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.79.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants