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] mail: overlapping activity counter badge #162744

Conversation

fw-bot
Copy link
Contributor

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

Steps to reproduce:

  • Go to activity view. (Ensure that it has at least 10-12 activity types)
  • Schedule multiple activities for the same day.
  • Activity count badge overlaps activity deadline!

Before this PR:
Activity count badge overlaps the activity deadline in an activity cell.

After this PR:
The issue has been resolved by tweaking the CSS of Activity Cell.

Task-3818264

Forward-Port-Of: #162573
Forward-Port-Of: #158512

Steps to reproduce:
- Go to activity view. (Ensure that it has at least 10-12 activity types)
- Schedule multiple activities for the same day.
- Activity count badge overlaps activity deadline!

This commit fixes the issue by tweaking the css of 'Activity Cell'.

Task-3818264

X-original-commit: 203d5bd
@robodoo
Copy link
Contributor

robodoo commented Apr 20, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 20, 2024

@khpa-odoo @tde-banana-odoo cherrypicking of pull request #158512 failed.

stdout:

Auto-merging addons/mail/static/src/views/web/activity/activity_cell.xml
CONFLICT (content): Merge conflict in addons/mail/static/src/views/web/activity/activity_cell.xml

stderr:

10:46:18.212811 git.c:463               trace: built-in: git cherry-pick b8feb4fae2083320e46e3e9a9f02946037c89b0d
error: could not apply b8feb4fae208... [FIX] mail: overlapping activity counter badge
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 Apr 20, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 20, 2024
@khpa-odoo
Copy link
Contributor

@tde-banana-odoo Hello : )
I believe the issue in question won't be faced from 17.0 onwards...
So I think we can close this PR. WDYT?

@tde-banana-odoo tde-banana-odoo deleted the 17.0-saas-16.3-fix-documents-activity-count-css-khpa-UsDk-fw branch April 24, 2024 07:02
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

5 participants