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] website_slides: only allow for a single review per user #156198

Conversation

fw-bot
Copy link
Contributor

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

Once a user posts a review, they are able to edit this single review and not create any new ones. However if the user had multiple tabs open of the same course, then they can still access the "Add a review" functionality.

This fix enforces the single review per user per course policy.

Task-3721958

Forward-Port-Of: #156137
Forward-Port-Of: #153679

@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 1, 2024

@bram1000 @std-odoo cherrypicking of pull request #153679 failed.

stdout:

Auto-merging addons/website_slides/controllers/mail.py
CONFLICT (content): Merge conflict in addons/website_slides/controllers/mail.py
Auto-merging addons/website_slides/i18n/website_slides.pot
Auto-merging addons/website_slides/tests/test_security.py

stderr:

21:33:22.469386 git.c:463               trace: built-in: git cherry-pick 51fec803a76d9a90c335285967e884b31f5f307b
error: could not apply 51fec803a76d... [FIX] website_slides: only allow for a single review per user
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 1, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 1, 2024
Once a user posts a review, they are able to edit this single review
and not create any new ones. However if the user had multiple tabs open
of the same course, then they can still access the "Add a review"
functionality.

This fix enforces the single review per user per course policy.

Task-3721958

X-original-commit: 7ba07df
@bram1000 bram1000 force-pushed the saas-16.2-15.0-slides-single-review-brvg-yIUn-fw branch from 6c4ab83 to cda2e9c Compare March 4, 2024 12:55
@C3POdoo C3POdoo requested a review from a team March 4, 2024 13:11
@bram1000
Copy link
Contributor

bram1000 commented Mar 4, 2024

@fw-bot r+

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 4, 2024

@bram1000 I can only do this on unmodified forward-port PRs, ask robodoo.

@bram1000
Copy link
Contributor

bram1000 commented Mar 4, 2024

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Mar 4, 2024

I'm sorry, @bram1000: this PR is already reviewed, reviewing it again is useless.

@bram1000
Copy link
Contributor

bram1000 commented Mar 4, 2024

@robodoo rebase-ff

@robodoo
Copy link
Contributor

robodoo commented Mar 4, 2024

Merge method set to rebase and fast-forward.

@bram1000
Copy link
Contributor

bram1000 commented Mar 4, 2024

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Mar 4, 2024

I'm sorry, @bram1000: this PR is already reviewed, reviewing it again is useless.

robodoo pushed a commit that referenced this pull request Mar 4, 2024
Once a user posts a review, they are able to edit this single review
and not create any new ones. However if the user had multiple tabs open
of the same course, then they can still access the "Add a review"
functionality.

This fix enforces the single review per user per course policy.

Task-3721958

closes #156198

X-original-commit: 7ba07df
Signed-off-by: Stéphane Debauche (std) <std@odoo.com>
Signed-off-by: Bram Van Gaal (brvg) <brvg@odoo.com>
@robodoo robodoo closed this Mar 4, 2024
@fw-bot fw-bot deleted the saas-16.2-15.0-slides-single-review-brvg-yIUn-fw branch March 18, 2024 19:46
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