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] web: show event date/duration on popover #165793

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 16, 2024

Issue:

  • when you open a calendar event popover, you can't see its time and duration

Steps To Reproduce:

  • In mobile view, go to calendar and create an event.
  • Click on the event and notice you can't see it's time and duration.

Solution:

  • We want to display the time in the popover for all modes. Therefore, I removed the scale === "month" condition from showTime. The showTime variable is used to set the isTimeHidden attribute, which is then checked in the computeDateTimeAndDuration function of the calendar popover.

opw-3829004


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #160907

@robodoo
Copy link
Contributor

robodoo commented May 16, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented May 16, 2024

@kawkb @mcm-odoo cherrypicking of pull request #160907 failed.

stdout:

Auto-merging addons/web/static/src/views/calendar/calendar_model.js
Auto-merging addons/web/static/tests/views/calendar/calendar_view_tests.js
CONFLICT (content): Merge conflict in addons/web/static/tests/views/calendar/calendar_view_tests.js

stderr:

15:46:38.528964 git.c:463               trace: built-in: git cherry-pick e978583e8ba08ddb6dab292fc5ecad0d2bf7cc53
error: could not apply e978583e8ba0... [FIX] web: show event date/duration on popover
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 May 16, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label May 16, 2024
Issue:
    - when you open a calendar event popover ,
    you can't see its time and duration

Steps To Reproduce:
    - Go to calendar and create an event.
    - Click on the event and notice you can't
    see it's time and duration in popover.

Solution:
    - We want to display the time in the popover for all
     modes. Therefore, I removed the scale === "month"
     condition from showTime. The showTime variable is used
     to set the isTimeHidden attribute, which is then checked
     in the computeDateTimeAndDuration function of the calendar
     popover.

opw-3829004

X-original-commit: 93a3f02
@kawkb kawkb force-pushed the 17.0-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-fwS_-fw branch from 6f64d28 to 9e6b12f Compare May 21, 2024 11:23
@C3POdoo C3POdoo requested review from a team, Iucapad and juliusc2066 and removed request for a team May 21, 2024 11:26
@kawkb
Copy link
Contributor

kawkb commented May 21, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request May 21, 2024
Issue:
    - when you open a calendar event popover ,
    you can't see its time and duration

Steps To Reproduce:
    - Go to calendar and create an event.
    - Click on the event and notice you can't
    see it's time and duration in popover.

Solution:
    - We want to display the time in the popover for all
     modes. Therefore, I removed the scale === "month"
     condition from showTime. The showTime variable is used
     to set the isTimeHidden attribute, which is then checked
     in the computeDateTimeAndDuration function of the calendar
     popover.

opw-3829004

closes #165793

X-original-commit: 93a3f02
Signed-off-by: Michaël Mattiello (mcm) <mcm@odoo.com>
Signed-off-by: Kawtar Drissi El Bouzaidi (kdeb) <kdeb@odoo.com>
@robodoo robodoo closed this in c0017c2 May 21, 2024
@fw-bot fw-bot deleted the 17.0-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-fwS_-fw branch June 4, 2024 22: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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants