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

Forward Port of #36284 to saas-11.3 (failed) #36651

Conversation

@fw-bot
Copy link
Contributor

commented Sep 10, 2019

Cherrypicking 844dec1 of source #36284 failed with the following

stdout:


stderr:

warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2240 and retry the command.
error: could not apply 844dec129a4... [FIX] web: use search view input with composition mode
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'addons/web/static/src/js/chrome/search_view.js'

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.

@robodoo

This comment has been minimized.

Copy link
Contributor

commented Sep 10, 2019

Ping @alexkuhn

[FIX] web: use search view input with composition mode
Forward-port of #36640 (original: #35789)

Before this commit, search view was barely usable with Japanese IME.

For instance, when pressing ENTER while in composition mode and
IME prompts some suggestions, it made a search with the updated input
content. The expected behaviour should have been to update the input
content, without making the search yet.

This commit fixes the issue by turning off some actions of the
search view when typing during composition mode.

opw-2061590

@alexkuhn alexkuhn force-pushed the odoo-dev:saas-11.3-10.0-fixes-aku-MZH6ZJ36-forwardport branch from def5eca to e27b660 Sep 11, 2019

@alexkuhn

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

@robodoo robodoo added r+ 👌 CI 🤖 and removed CI 🤖 labels Sep 11, 2019

robodoo pushed a commit that referenced this pull request Sep 11, 2019
[FIX] web: use search view input with composition mode
Forward-port of #36640 (original: #35789)

Before this commit, search view was barely usable with Japanese IME.

For instance, when pressing ENTER while in composition mode and
IME prompts some suggestions, it made a search with the updated input
content. The expected behaviour should have been to update the input
content, without making the search yet.

This commit fixes the issue by turning off some actions of the
search view when typing during composition mode.

opw-2061590

closes #36651

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
@robodoo

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

Merged at c23f52e, thanks!

@robodoo robodoo closed this Sep 11, 2019

alexkuhn added a commit to odoo-dev/odoo that referenced this pull request Sep 11, 2019
[FIX] web: use search view input with composition mode
Forward-port of odoo#36651 (original: odoo#35789)

Before this commit, search view was barely usable with Japanese IME.

For instance, when pressing ENTER while in composition mode and
IME prompts some suggestions, it made a search with the updated input
content. The expected behaviour should have been to update the input
content, without making the search yet.

This commit fixes the issue by turning off some actions of the
search view when typing during composition mode.

opw-2061590
robodoo pushed a commit that referenced this pull request Sep 11, 2019
[FIX] web: use search view input with composition mode
Forward-port of #36651 (original: #35789)

Before this commit, search view was barely usable with Japanese IME.

For instance, when pressing ENTER while in composition mode and
IME prompts some suggestions, it made a search with the updated input
content. The expected behaviour should have been to update the input
content, without making the search yet.

This commit fixes the issue by turning off some actions of the
search view when typing during composition mode.

opw-2061590

closes #36688

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>

@alexkuhn alexkuhn deleted the odoo-dev:saas-11.3-10.0-fixes-aku-MZH6ZJ36-forwardport branch Sep 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.