odoo/odoo#159545

Created by fw-bot

label

odoo-dev:saas-17.1-15.0-fix-global-context-dam-Q3td-fw

head

f90f66e8f6608d96f3ba11a6cbeac2e5a0e38632

target

saas-17.1

merged

2 months ago by JavaScript, Mathieu Duckerts-Antoine (dam)

forward-port of

odoo/odoo#158833 DETACHED (conflicts: ('ff7b9d23edef6147204a33252b9ae73ae47ec7f3', 'Auto-merging addons/web/static/src/search/search_model.js\nAuto-merging addons/web/static/tests/search/with_search_tests.js\nAuto-merging addons/web/static/tests/webclient/actions/misc_tests.js\nCONFLICT (content): Merge conflict in addons/web/static/tests/webclient/actions/misc_tests.js\n', '18:46:10.921301 git.c:463 trace: built-in: git cherry-pick ff7b9d23edef6147204a33252b9ae73ae47ec7f3\nerror: could not apply ff7b9d23edef... [FIX] web: WithSearch: filtering search defaults\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['ff7b9d23edef6147204a33252b9ae73ae47ec7f3']) ('ff7b9d23edef6147204a33252b9ae73ae47ec7f3', 'Auto-merging addons/web/static/src/search/search_model.js\nAuto-merging addons/web/static/tests/search/with_search_tests.js\nAuto-merging addons/web/static/tests/webclient/actions/misc_tests.js\nCONFLICT (content): Merge conflict in addons/web/static/tests/webclient/actions/misc_tests.js\n', '18:46:10.921301 git.c:463 trace: built-in: git cherry-pick ff7b9d23edef6147204a33252b9ae73ae47ec7f3\nerror: could not apply ff7b9d23edef... [FIX] web: WithSearch: filtering search defaults\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['ff7b9d23edef6147204a33252b9ae73ae47ec7f3']))

[FW][FIX] web: WithSearch: filtering search defaults

Before that commit, the search defaults were removed from the WithSearch prop context by the WithSearch (search model).

Fix that problem brings another one (that we also fix): The search defaults are not filtered when the WithSearch is started with a search model state or updated by its parent.

Forward-Port-Of: odoo/odoo#159406
Forward-Port-Of: odoo/odoo#158833