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 #166408

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 22, 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: #166279
Forward-Port-Of: #160907

@robodoo
Copy link
Contributor

robodoo commented May 22, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented May 22, 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/legacy/views/calendar/calendar_view_tests.js
CONFLICT (content): Merge conflict in addons/web/static/tests/legacy/views/calendar/calendar_view_tests.js

stderr:

21:38:22.402985 git.c:463               trace: built-in: git cherry-pick 0ab910d635d9fb420764800e85647dc6e18099bd
error: could not apply 0ab910d635d9... [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 22, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label May 22, 2024
@kawkb kawkb force-pushed the saas-17.2-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-5h1v-fw branch from 97c5be3 to 43ec907 Compare May 23, 2024 08:46
@kawkb
Copy link
Contributor

kawkb commented May 23, 2024

@robodoo r+

@C3POdoo C3POdoo requested review from a team, aab-odoo and Iucapad and removed request for a team May 23, 2024 08:49
@kawkb kawkb force-pushed the saas-17.2-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-5h1v-fw branch from 43ec907 to 681ad64 Compare May 27, 2024 14:30
@kawkb
Copy link
Contributor

kawkb commented May 27, 2024

@robodoo r+

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: e17f28d
@kawkb kawkb force-pushed the saas-17.2-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-5h1v-fw branch from 681ad64 to ecaae0b Compare May 28, 2024 01:12
@kawkb
Copy link
Contributor

kawkb commented May 28, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request May 28, 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 #166408

X-original-commit: e17f28d
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 May 28, 2024
@fw-bot fw-bot deleted the saas-17.2-saas-16.3-OPW-3829004-web_add_event_date_duration_on_mobile-kdeb-5h1v-fw branch June 11, 2024 04:47
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