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.

Sign up for GitHub

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

[stable4.7] fix(freebusy): free busy ignoring user's time zone #6673

Merged
merged 1 commit into from
Feb 3, 2025
Merged

[stable4.7] fix(freebusy): free busy ignoring user's time zone #6673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Editor/FreeBusy/FreeBusy.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</template>
</NcButton>
</template>
<template>

Check warning on line 85 in src/components/Editor/FreeBusy/FreeBusy.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

`<template>` require directive
<div class="freebusy-caption">
<div class="freebusy-caption__calendar-user-types" />
<div class="freebusy-caption__colors">
Expand Down Expand Up @@ -218,7 +218,7 @@
type: Date,
required: true,
},
eventTitle: {

Check warning on line 221 in src/components/Editor/FreeBusy/FreeBusy.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

Prop 'eventTitle' requires default value to be set
type: String,
required: false,
},
Expand Down Expand Up @@ -249,7 +249,7 @@

this.findFreeSlots()
},
computed: {

Check warning on line 252 in src/components/Editor/FreeBusy/FreeBusy.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

The "computed" property should be above the "mounted" property on line 246
...mapGetters({
timezoneId: 'getResolvedTimezone',
}),
Expand All @@ -264,7 +264,7 @@
/**
* FullCalendar Plugins
*
* @return {(PluginDef)[]}

Check warning on line 267 in src/components/Editor/FreeBusy/FreeBusy.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

The type 'PluginDef' is undefined
*/
plugins() {
return [
Expand Down Expand Up @@ -485,7 +485,7 @@
this.attendees.map((a) => a.attendeeProperty),
startSearch,
endSearchDate,
this.timeZoneId
this.timezoneId
)

const freeSlots = getFirstFreeSlot(
Expand Down
Loading