Skip to content

Don't break app by subscribed calendars #911

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

Merged
raimund-schluessler merged 1 commit into from
Mar 8, 2020
Merged

Don't break app by subscribed calendars #911

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
14 changes: 13 additions & 1 deletion src/store/calendars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ export function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
// As fallback if we don't know what color that is supposed to be
color = uidToHexColor(displayName)
}

const shares = []
if (!!currentUserPrincipal && Array.isArray(calendar.shares)) {
for (const share of calendar.shares) {
if (share.href === currentUserPrincipal.principalScheme) {
continue
}

shares.push(mapDavShareeToSharee(share))
}
}

return {
// get last part of url
id: calendar.url.split('/').slice(-2, -1)[0],
Expand All @@ -99,7 +111,7 @@ export function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
tasks: {},
url: calendar.url,
dav: calendar,
shares: calendar.shares.map(sharee => Object.assign({}, mapDavShareeToSharee(sharee))),
shares,
supportsTasks: calendar.components.includes('VTODO'),
loadedCompleted: false,
isSharedWithMe,
Expand Down