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(meta): ensure that insert_after is always considered when sorting fields #18682

Merged
merged 2 commits into from Oct 31, 2022

Conversation

sagarvora
Copy link
Member

@sagarvora sagarvora commented Oct 31, 2022

In lieu of #18327 and #11486 😅

Steps to replicate: #11486 (comment)

Closes #17165

@sagarvora sagarvora requested a review from a team as a code owner October 31, 2022 07:01
@sagarvora sagarvora requested review from shariquerik and ankush and removed request for a team and shariquerik October 31, 2022 07:01
@sagarvora sagarvora added the backport version-14-hotfix backport to version 14 label Oct 31, 2022
@sagarvora sagarvora force-pushed the sort_fields++ branch 2 times, most recently from b507376 to 3b8346e Compare October 31, 2022 07:12
@codecov
Copy link

codecov bot commented Oct 31, 2022

Codecov Report

Merging #18682 (3b8346e) into develop (e564dcb) will increase coverage by 0.05%.
The diff coverage is 100.00%.

❗ Current head 3b8346e differs from pull request most recent head 48f54a2. Consider uploading reports for the commit 48f54a2 to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #18682      +/-   ##
===========================================
+ Coverage    63.00%   63.06%   +0.05%     
===========================================
  Files          747      747              
  Lines        67794    67913     +119     
  Branches      5996     5996              
===========================================
+ Hits         42716    42830     +114     
- Misses       21618    21623       +5     
  Partials      3460     3460              
Flag Coverage Δ
server-mariadb 67.16% <97.36%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

frappe/model/meta.py Outdated Show resolved Hide resolved
@sagarvora sagarvora force-pushed the sort_fields++ branch 2 times, most recently from 5ff764e to 133c348 Compare October 31, 2022 09:36
…ng fields

Co-authored-by: Dany Roberts <danyrt@wahni.com>
ankush
ankush previously approved these changes Oct 31, 2022
Copy link
Member

@ankush ankush left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sagarvora sagarvora merged commit cb7d25a into frappe:develop Oct 31, 2022
@sagarvora sagarvora deleted the sort_fields++ branch October 31, 2022 10:08
@ankush ankush removed the dont-merge label Oct 31, 2022
mergify bot pushed a commit that referenced this pull request Oct 31, 2022
…ng fields (#18682)

* fix(meta): ensure that `insert_after` is always considered when sorting fields

* test: add nosemgrep to comment

Co-authored-by: Dany Roberts <danyrt@wahni.com>
(cherry picked from commit cb7d25a)
ankush added a commit that referenced this pull request Nov 1, 2022
…-18682

fix(meta): ensure that `insert_after` is always considered when sorting fields (backport #18682)
frappe-pr-bot pushed a commit that referenced this pull request Nov 8, 2022
## [14.14.3](v14.14.2...v14.14.3) (2022-11-08)

### Bug Fixes

* check permission before print or download document ([#18757](#18757)) ([#18785](#18785)) ([9b5225f](9b5225f))
* child table don't run mobile specific code ([d9af38b](d9af38b))
* dont close static modal with keyboard ([3e45d80](3e45d80))
* encode docname when routing (backport [#17092](#17092)) ([#17374](#17374)) ([#18748](#18748)) ([9fbccc7](9fbccc7))
* file cropper broken in webform ([e4bb26e](e4bb26e))
* hide value only if it's equal to the label ([#18722](#18722)) ([#18723](#18723)) ([e88f950](e88f950))
* ignore global translations ([#18733](#18733)) ([#18735](#18735)) ([5f36923](5f36923))
* load `doc_before_save` in `check_if_latest` ([#18752](#18752)) ([#18753](#18753)) ([243cfa3](243cfa3))
* **meta:** ensure that `insert_after` is always considered when sorting fields ([#18682](#18682)) ([2f0de9a](2f0de9a))
* not able to click checkbox in file grid view ([8f2e428](8f2e428))
* remove redundant translation ([#18775](#18775)) ([#18780](#18780)) ([a27c42e](a27c42e))
* search.py after PR [#17828](#17828) ([#18719](#18719)) ([#18721](#18721)) ([d5f39ea](d5f39ea))
* show 0 for empty currency, float, & duration fields in list view ([6edbbd4](6edbbd4))
* standard dashboards not loading ([ee1fb87](ee1fb87))
* translations ([#18765](#18765)) ([#18782](#18782)) ([aa68138](aa68138))
* **UX:** allow clicking on row to open in new tab ([#18789](#18789)) ([#18790](#18790)) ([f7d9d43](f7d9d43))

### Performance Improvements

* load `_doc_before_save` sooner to avoid DB call in `check_if_latest` ([#18666](#18666)) ([2710d08](2710d08))
stephenBDT pushed a commit to alias/frappe that referenced this pull request Nov 11, 2022
…ng fields (frappe#18682)

* fix(meta): ensure that `insert_after` is always considered when sorting fields

* test: add nosemgrep to comment

Co-authored-by: Dany Roberts <danyrt@wahni.com>
(cherry picked from commit cb7d25a)
stephenBDT pushed a commit to alias/frappe that referenced this pull request Nov 11, 2022
## [14.14.3](frappe/frappe@v14.14.2...v14.14.3) (2022-11-08)

### Bug Fixes

* check permission before print or download document ([frappe#18757](frappe#18757)) ([frappe#18785](frappe#18785)) ([9b5225f](frappe@9b5225f))
* child table don't run mobile specific code ([d9af38b](frappe@d9af38b))
* dont close static modal with keyboard ([3e45d80](frappe@3e45d80))
* encode docname when routing (backport [frappe#17092](frappe#17092)) ([frappe#17374](frappe#17374)) ([frappe#18748](frappe#18748)) ([9fbccc7](frappe@9fbccc7))
* file cropper broken in webform ([e4bb26e](frappe@e4bb26e))
* hide value only if it's equal to the label ([frappe#18722](frappe#18722)) ([frappe#18723](frappe#18723)) ([e88f950](frappe@e88f950))
* ignore global translations ([frappe#18733](frappe#18733)) ([frappe#18735](frappe#18735)) ([5f36923](frappe@5f36923))
* load `doc_before_save` in `check_if_latest` ([frappe#18752](frappe#18752)) ([frappe#18753](frappe#18753)) ([243cfa3](frappe@243cfa3))
* **meta:** ensure that `insert_after` is always considered when sorting fields ([frappe#18682](frappe#18682)) ([2f0de9a](frappe@2f0de9a))
* not able to click checkbox in file grid view ([8f2e428](frappe@8f2e428))
* remove redundant translation ([frappe#18775](frappe#18775)) ([frappe#18780](frappe#18780)) ([a27c42e](frappe@a27c42e))
* search.py after PR [frappe#17828](frappe#17828) ([frappe#18719](frappe#18719)) ([frappe#18721](frappe#18721)) ([d5f39ea](frappe@d5f39ea))
* show 0 for empty currency, float, & duration fields in list view ([6edbbd4](frappe@6edbbd4))
* standard dashboards not loading ([ee1fb87](frappe@ee1fb87))
* translations ([frappe#18765](frappe#18765)) ([frappe#18782](frappe#18782)) ([aa68138](frappe@aa68138))
* **UX:** allow clicking on row to open in new tab ([frappe#18789](frappe#18789)) ([frappe#18790](frappe#18790)) ([f7d9d43](frappe@f7d9d43))

### Performance Improvements

* load `_doc_before_save` sooner to avoid DB call in `check_if_latest` ([frappe#18666](frappe#18666)) ([2710d08](frappe@2710d08))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect ordering of custom fields
2 participants