fix(rename): check for permissions for merged document as well by akhilnarang [frappe] PR#28595

Bot Dokosrequested to merge
ft-pr-28595 into develop

From: https://github.com/frappe/frappe/pull/28595
Date: 2024-11-28 16:27:22+05:30

  • Merge pull request #28595 from akhilnarang/check-permission-before-merge
  • fix(rename): check for permissions for merged document as well


Diagnostics

pre-commit failed for source commit: a70973b0c59bc898e28a034c708998639d42343b
frappe/model/rename_doc.py:122:7: RUF013 PEP 484 prohibits implicit `Optional`
frappe/model/rename_doc.py:419:24: RUF005 Consider `("Link", *frappe.model.table_fields)` instead of concatenation
frappe/model/rename_doc.py:669:2: F841 Local variable `all_singles` is assigned to but never used
Found 3 errors.
No fixes available (3 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 49fe842463740b7be2967060d8f3a573758b63de
frappe/model/rename_doc.py:122:7: RUF013 PEP 484 prohibits implicit `Optional`
frappe/model/rename_doc.py:419:24: RUF005 Consider `("Link", *frappe.model.table_fields)` instead of concatenation
frappe/model/rename_doc.py:669:2: F841 Local variable `all_singles` is assigned to but never used
Found 3 errors.
No fixes available (3 hidden fixes can be enabled with the `--unsafe-fixes` option).


Suspicious merge commit detected: 49fe842463740b7be2967060d8f3a573758b63de


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-28595

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-28595

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports