Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Feb 27, 2025

Before this commit and since #110188,

The people invited to a channel by someone in a call in that channel wouldn't receive a call invitation, as the invitation parameter was omitted during the refactor. This commit fixes this issue.

Forward-Port-Of: #199580

@robodoo
Copy link
Contributor

robodoo commented Feb 27, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 27, 2025

@ThanhDodeurOdoo @seb-odoo cherrypicking of pull request #199580 failed.

stdout:

Auto-merging addons/mail/static/src/discuss/core/common/channel_invitation.js
CONFLICT (modify/delete): addons/mail/static/tests/discuss/call/call_tests.js deleted in 1706ced19e91a4e00c6475295be07e3f0ca94657 and modified in 16c8e78a430f6de0a82536fb6542522d5c7c8817.  Version 16c8e78a430f6de0a82536fb6542522d5c7c8817 of addons/mail/static/tests/discuss/call/call_tests.js left in tree.
Auto-merging addons/mail/static/tests/legacy/helpers/mock_server/models/discuss_channel.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.

⚠️ 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 Feb 27, 2025
@C3POdoo C3POdoo added the RD research & development, internal work label Feb 27, 2025
Before this commit and since odoo#110188,

The people invited to a channel by someone in a call in that channel
wouldn't receive a call invitation, as the invitation parameter was
omitted during the refactor. This commit fixes this issue.

X-original-commit: 8ec4108
@ThanhDodeurOdoo ThanhDodeurOdoo force-pushed the saas-17.4-17.0-invite-call-fix-tso-419263-fw branch from f7c7503 to 0d64457 Compare February 28, 2025 07:25
@C3POdoo C3POdoo requested review from a team February 28, 2025 07:28
Copy link
Contributor

@seb-odoo seb-odoo left a comment

Choose a reason for hiding this comment

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

robodoo pushed a commit that referenced this pull request Feb 28, 2025
Before this commit and since #110188,

The people invited to a channel by someone in a call in that channel
wouldn't receive a call invitation, as the invitation parameter was
omitted during the refactor. This commit fixes this issue.

closes #199682

X-original-commit: 8ec4108
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
@robodoo robodoo closed this Feb 28, 2025
@alexkuhn alexkuhn deleted the saas-17.4-17.0-invite-call-fix-tso-419263-fw branch March 3, 2025 16:17
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.

5 participants