Skip to content

Draft: fix!: Switch to `creation` as default sort order by ankush [frappe] PR#25624

Bot Dokos requested to merge ft-pr-25624 into develop

From: https://github.com/frappe/frappe/pull/25624
Date: 2024-03-27 13:25:53+05:30

  • Merge pull request #25624 from ankush/creation
  • fix: switch default sort for new doctypes
  • refactor!: sort by creation for clearing old logs
  • fix: rewrite __UserSettings to update default sort order
  • refactor: update usage of modified everywhere
  • fix: only drop modified index if default sort_field is changed
  • fix: patch for migrating default sort order
  • fix: update sort order in doctypes
  • fix!: Switch to creation as default sort order


Diagnostics

pre-commit failed for source commit: 071e269548d182700498f44791772205a2cf47ab
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/database/database.py:60:21: RUF012 Mutable class attributes should be annotated with `typing.ClassVar`
frappe/database/database.py:61:22: RUF012 Mutable class attributes should be annotated with `typing.ClassVar`
frappe/database/database.py:63:20: RUF012 Mutable class attributes should be annotated with `typing.ClassVar`
Found 3 errors.


Conflicts detected for source commit: 3896296c6f131eedddc357cc791d844050656d8d
- DU frappe/core/doctype/transaction_log/transaction_log.json
pre-commit failed for source commit: 3896296c6f131eedddc357cc791d844050656d8d
check json...............................................................Failed
- hook id: check-json
- exit code: 1

frappe/website/doctype/help_category/help_category.json: Failed to json decode (Duplicate key: icon)


pre-commit failed for source commit: dbcf7ad30ccb8848fb1a3f8ae99d92954f8a7c36
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/__init__.py:1940:19: RUF005 Consider iterable unpacking instead of concatenation
Found 1 error.
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 672f3b225873468fadd7b7ec9c27998f4621d1b7
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1
- files were modified by this hook

frappe/email/doctype/email_queue/email_queue.py:756:26: RUF005 Consider `[r, *self.final_cc(), *self.bcc]` instead of concatenation
Found 2 errors (1 fixed, 1 remaining).
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).

Format Python code.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 17 files left unchanged


pre-commit failed for source commit: c91ea8ccd58885d4940fe885425fb0b27edd30ca
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/tests/test_commands.py:610:15: RUF012 Mutable class attributes should be annotated with `typing.ClassVar`
Found 1 error.


Conflicts detected for source commit: 432c8cf48c78bb2635a7126316c87e827b3d78db
- DU frappe/automation/doctype/auto_repeat_day/auto_repeat_day.json
Suspicious merge commit detected: 432c8cf48c78bb2635a7126316c87e827b3d78db


Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
  460314e734888709840b3c41dab40855d5a4a582 refactor!: sort by creation for clearing old logs
  6219ad042eda92d27eeaff6b42e5193da1275f3b fix: update sort order in doctypes


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

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

# 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