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: Desk User role (backport #22224) #26237

Merged
merged 7 commits into from Apr 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2024

docs: https://frappeframework.com/docs/user/en/basics/users-and-permissions


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

(cherry picked from commit 1b406ed)

# Conflicts:
#	frappe/core/doctype/doctype/doctype.py
#	frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.py
#	frappe/core/page/permission_manager/permission_manager.py
#	frappe/desk/page/setup_wizard/setup_wizard.py
#	frappe/permissions.py
@mergify mergify bot requested a review from a team as a code owner April 30, 2024 06:54
@mergify mergify bot added the conflicts label Apr 30, 2024
@mergify mergify bot requested review from akhilnarang and removed request for a team April 30, 2024 06:54
@mergify mergify bot assigned ankush Apr 30, 2024
Copy link
Contributor Author

mergify bot commented Apr 30, 2024

Cherry-pick of 1b406ed has failed:

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

You are currently cherry-picking commit 1b406edd54.
  (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/user.py
	modified:   frappe/desk/doctype/todo/todo.py
	modified:   frappe/tests/test_permissions.py
	modified:   frappe/tests/ui_test_helpers.py
	modified:   frappe/twofactor.py
	modified:   frappe/utils/user.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/doctype/doctype.py
	both modified:   frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.py
	both modified:   frappe/core/page/permission_manager/permission_manager.py
	both modified:   frappe/desk/page/setup_wizard/setup_wizard.py
	both modified:   frappe/permissions.py

Cherry-pick of dc8d7b0 has failed:

On branch mergify/bp/version-14-hotfix/pr-22224
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dc8d7b019a.
  (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/activity_log/activity_log.json
	modified:   frappe/core/doctype/report/report.json
	modified:   frappe/core/doctype/role/role.js
	modified:   frappe/core/doctype/user_group/user_group.json
	modified:   frappe/custom/doctype/doctype_layout/doctype_layout.json
	modified:   frappe/desk/doctype/calendar_view/calendar_view.json
	modified:   frappe/desk/doctype/custom_html_block/custom_html_block.json
	modified:   frappe/desk/doctype/dashboard/dashboard.json
	modified:   frappe/desk/doctype/dashboard_settings/dashboard_settings.json
	modified:   frappe/desk/doctype/form_tour/form_tour.json
	modified:   frappe/desk/doctype/kanban_board/kanban_board.json
	modified:   frappe/desk/doctype/module_onboarding/module_onboarding.json
	modified:   frappe/desk/doctype/onboarding_step/onboarding_step.json
	modified:   frappe/email/doctype/document_follow/document_follow.json
	modified:   frappe/integrations/doctype/google_calendar/google_calendar.json
	modified:   frappe/printing/doctype/network_printer_settings/network_printer_settings.json
	modified:   frappe/social/doctype/energy_point_log/energy_point_log.json
	modified:   frappe/workflow/doctype/workflow_action/workflow_action.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   frappe/automation/doctype/reminder/reminder.json
	deleted by us:   frappe/core/doctype/submission_queue/submission_queue.json
	both modified:   frappe/desk/doctype/dashboard_chart/dashboard_chart.json
	both modified:   frappe/desk/doctype/list_filter/list_filter.json
	both modified:   frappe/desk/doctype/note/note.json
	both modified:   frappe/desk/doctype/number_card/number_card.json
	both modified:   frappe/email/doctype/email_template/email_template.json
	both modified:   frappe/integrations/doctype/google_contacts/google_contacts.json
	both modified:   frappe/printing/doctype/letter_head/letter_head.json
	both modified:   frappe/printing/doctype/print_format/print_format.json
	deleted by us:   frappe/website/doctype/marketing_campaign/marketing_campaign.json
	both modified:   frappe/workflow/doctype/workflow_state/workflow_state.json

Cherry-pick of 85956ed has failed:

On branch mergify/bp/version-14-hotfix/pr-22224
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 85956ed0c1.
  (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/social/doctype/energy_point_log/test_energy_point_log.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/utils.py

Cherry-pick of 8176b86 has failed:

On branch mergify/bp/version-14-hotfix/pr-22224
Your branch is ahead of 'origin/version-14-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8176b86b25.
  (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/doctype/notification_settings/notification_settings.py
	modified:   frappe/hooks.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/utils.py

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

@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-22224 branch from 6cfcc5a to 9625374 Compare April 30, 2024 07:18
@ankush ankush removed the conflicts label Apr 30, 2024
@ankush ankush enabled auto-merge (squash) April 30, 2024 10:20
@ankush
Copy link
Member

ankush commented Apr 30, 2024

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Apr 30, 2024

update

✅ Branch has been successfully updated

@ankush ankush merged commit 171e1d0 into version-14-hotfix Apr 30, 2024
11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-22224 branch April 30, 2024 12:47
frappe-pr-bot pushed a commit that referenced this pull request May 7, 2024
# [14.74.0](v14.73.0...v14.74.0) (2024-05-07)

### Bug Fixes

* Apply configured perms on address list ([#26334](#26334)) ([#26335](#26335)) ([4307ab4](4307ab4))
* args is a stringified JSON ([98ece0e](98ece0e))
* changes for scheduler reliability (backport [#26292](#26292)) ([#26293](#26293)) ([7691afe](7691afe))
* **Data Import:** don't rely on permission for Data Import Log (backport [#26228](#26228)) ([#26250](#26250)) ([fd0a844](fd0a844))
* **Data Import:** scheduler not needed in dev mode (backport [#24667](#24667)) ([#26264](#26264)) ([9712f14](9712f14))
* disabled user login from login via link feature ([#26134](#26134)) ([#26140](#26140)) ([96b7542](96b7542))
* don't add creation index if one exists ([#26295](#26295)) ([#26297](#26297)) ([c74dcbd](c74dcbd))
* **Geo:** change Canadian dates to ISO 8601 format ([351cd04](351cd04))
* init db conn for unbuffered cursor if not set ([#26220](#26220)) ([#26256](#26256)) ([04afefb](04afefb))
* lstrip for query writes detection ([#26180](#26180)) ([#26252](#26252)) ([6ebfe54](6ebfe54))
* multistep webform page navigation ([d5a25f2](d5a25f2))
* **Navbar Settings:** reload page after save ([#26274](#26274)) ([#26275](#26275)) ([73f265b](73f265b))
* **oauth2:** refresh token is optional ([#26266](#26266)) ([#26271](#26271)) ([d6603c6](d6603c6)), closes [/www.rfc-editor.org/rfc/rfc6749#section-5](https://github.com//www.rfc-editor.org/rfc/rfc6749/issues/section-5)
* only redirect to same domain (backport [#26304](#26304)) ([#26305](#26305)) ([c2f2d6c](c2f2d6c))
* perm query for dashboard (backport [#26239](#26239)) ([#26242](#26242)) ([4ab6a46](4ab6a46))
* reportview average of ints should be float (backport [#26284](#26284)) ([#26287](#26287)) ([c0f3912](c0f3912))
* Treeview DB lookup should perform the same preperation operations as method update_nsm in file nestedset.py ([#26199](#26199)) ([#26259](#26259)) ([01e08f8](01e08f8))

### Features

* `Desk User` role (backport [#22224](#22224)) ([#26237](#26237)) ([171e1d0](171e1d0))
* System Health Report (backport [#26046](#26046)) ([#26255](#26255)) ([f2d2d0c](f2d2d0c))

### Performance Improvements

* Reduce 1 redis call while dumping monitor logs (backport [#26337](#26337)) ([#26338](#26338)) ([75b2a86](75b2a86))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.74.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 May 22, 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.

None yet

2 participants