Skip to content

Do not return subscriptions on findAllCalendars()#272

Merged
georgehrke merged 2 commits into
masterfrom
bugfix/noid/do_not_return_subscription_on_findAllCalendars
Apr 20, 2020
Merged

Do not return subscriptions on findAllCalendars()#272
georgehrke merged 2 commits into
masterfrom
bugfix/noid/do_not_return_subscription_on_findAllCalendars

Conversation

@georgehrke

Copy link
Copy Markdown
Member

Signed-off-by: Georg Ehrke developer@georgehrke.com

@georgehrke

Copy link
Copy Markdown
Member Author

/compile amend /

@npmbuildbot-nextcloud npmbuildbot-nextcloud Bot force-pushed the bugfix/noid/do_not_return_subscription_on_findAllCalendars branch from cba880a to 5f2d76c Compare March 18, 2020 11:33
@raimund-schluessler

Copy link
Copy Markdown
Member

Hm, maybe I did something wrong, but on this branch nextcloud/tasks#942 and after npm install and npm run build I still see subscriptions appearing in the app.

Also, how does the Calendar app load subscriptions? Wouldn't this change also affect it?

@georgehrke

Copy link
Copy Markdown
Member Author

Also, how does the Calendar app load subscriptions? Wouldn't this change also affect it?

We set a special HTTP Header, so that the server returns Subscription as calendar collections. (so we can fetch cached events from the server)

@georgehrke

Copy link
Copy Markdown
Member Author

Hm, maybe I did something wrong, but on this branch nextcloud/tasks#942 and after npm install and npm run build I still see subscriptions appearing in the app.

Let me check that right now

@georgehrke

Copy link
Copy Markdown
Member Author

For some mysterious reason, the server is reporting subscriptions as calendars, although it should report them as subscription: https://github.com/sabre-io/dav/blob/master/lib/CalDAV/Subscriptions/Plugin.php#L34

@georgehrke

Copy link
Copy Markdown
Member Author

Ok, now this is embarrassing 🙈
Commit incoming ...

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
@georgehrke georgehrke force-pushed the bugfix/noid/do_not_return_subscription_on_findAllCalendars branch from 5f2d76c to 09207e0 Compare April 20, 2020 08:36
@georgehrke

Copy link
Copy Markdown
Member Author

This should obviously only be done in the calendar, not in cdav:
09207e0

@georgehrke georgehrke added the 3. to review Waiting for reviews label Apr 20, 2020
@georgehrke

Copy link
Copy Markdown
Member Author

@raimund-schluessler Please check again

@georgehrke georgehrke force-pushed the bugfix/noid/do_not_return_subscription_on_findAllCalendars branch from 09207e0 to e7d7354 Compare April 20, 2020 08:44
…t it if they need it

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke force-pushed the bugfix/noid/do_not_return_subscription_on_findAllCalendars branch from e7d7354 to 5a729c9 Compare April 20, 2020 08:51
@raimund-schluessler

Copy link
Copy Markdown
Member

@raimund-schluessler Please check again

Subscriptions don't show up anymore 👍

@georgehrke georgehrke merged commit d344c0e into master Apr 20, 2020
@georgehrke georgehrke deleted the bugfix/noid/do_not_return_subscription_on_findAllCalendars branch April 20, 2020 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants