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] Composer: pressing enter in the link editor #4002

Closed

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 5, 2024

Description:

Previously, pressing Enter in the link editor would inadvertently open the grid composer in edit mode, which was not the expected behavior. This PR addresses the issue by adding a check in the onInput method of the composer component.

Task: : 3796114

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #3931

@robodoo
Copy link
Collaborator

robodoo commented Apr 5, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 5, 2024

@dhrp-odoo @rrahir cherrypicking of pull request #3931 failed.

stdout:

Auto-merging src/components/link/link_editor/link_editor.ts
CONFLICT (content): Merge conflict in src/components/link/link_editor/link_editor.ts
Auto-merging tests/components/composer.test.ts
CONFLICT (content): Merge conflict in tests/components/composer.test.ts

stderr:

17:51:10.433497 git.c:463               trace: built-in: git cherry-pick aba4a378b21d09b8e5db202ad925f7acb0afe7ed
error: could not apply aba4a378b... [FIX] Composer: pressing enter in the link editor
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

Previously, pressing Enter in the link editor would inadvertently open
the grid composer in edit mode, which was not the expected behavior.
This commit addresses the issue by adding a check in the onInput method
of the composer component.

Taskid: 3796114
X-original-commit: 9fcb43d
@dhrp-odoo dhrp-odoo force-pushed the saas-16.3-16.0-fix-link-editor-enter-dhrp-tVM0-fw branch from d138781 to 5e417b9 Compare April 8, 2024 05:22
@dhrp-odoo
Copy link
Contributor

@rrahir, Conflict resolved!

@rrahir
Copy link
Collaborator

rrahir commented Apr 8, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 8, 2024
Previously, pressing Enter in the link editor would inadvertently open
the grid composer in edit mode, which was not the expected behavior.
This commit addresses the issue by adding a check in the onInput method
of the composer component.

closes #4002

Taskid: 3796114
X-original-commit: 9fcb43d
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
@robodoo robodoo closed this Apr 8, 2024
@fw-bot fw-bot deleted the saas-16.3-16.0-fix-link-editor-enter-dhrp-tVM0-fw branch April 22, 2024 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants