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

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

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 27, 2024

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: #159406
Forward-Port-Of: #158833

@robodoo
Copy link
Contributor

robodoo commented Mar 27, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 27, 2024

@Polymorphe57 @FrancoisGe cherrypicking of pull request #158833 failed.

stdout:

Auto-merging addons/web/static/src/search/search_model.js
Auto-merging addons/web/static/tests/search/with_search_tests.js
Auto-merging addons/web/static/tests/webclient/actions/misc_tests.js
CONFLICT (content): Merge conflict in addons/web/static/tests/webclient/actions/misc_tests.js

stderr:

18:46:10.921301 git.c:463               trace: built-in: git cherry-pick ff7b9d23edef6147204a33252b9ae73ae47ec7f3
error: could not apply ff7b9d23edef... [FIX] web: WithSearch: filtering search defaults
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 27, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 27, 2024
@Polymorphe57 Polymorphe57 force-pushed the saas-17.1-15.0-fix-global-context-dam-Q3td-fw branch from 5f9a736 to 98fe21b Compare March 28, 2024 09:00
@C3POdoo C3POdoo requested review from a team, aab-odoo and BastienFafchamps and removed request for a team March 28, 2024 09:02
Before that commit, the search defaults would not be filtered when the
WithSearch is started with a search model state or updated by its parent.

X-original-commit: 7ac5dcc
@Polymorphe57 Polymorphe57 force-pushed the saas-17.1-15.0-fix-global-context-dam-Q3td-fw branch from 98fe21b to f90f66e Compare March 28, 2024 09:04
@Polymorphe57
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 28, 2024
Before that commit, the search defaults would not be filtered when the
WithSearch is started with a search model state or updated by its parent.

closes #159545

X-original-commit: 7ac5dcc
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
Signed-off-by: Mathieu Duckerts-Antoine (dam) <dam@odoo.com>
@robodoo robodoo closed this Mar 28, 2024
@fw-bot fw-bot deleted the saas-17.1-15.0-fix-global-context-dam-Q3td-fw branch April 11, 2024 14:47
alialfie pushed a commit to odoo-dev/odoo that referenced this pull request Apr 22, 2024
Before that commit, the search defaults would not be filtered when the
WithSearch is started with a search model state or updated by its parent.

closes odoo#159545

X-original-commit: 7ac5dcc
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
Signed-off-by: Mathieu Duckerts-Antoine (dam) <dam@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants