Skip to content

Change CALDAV to allow calendars be shared with circles. #6512

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
MorrisJobke merged 10 commits into from
Mar 12, 2019
Merged

Change CALDAV to allow calendars be shared with circles. #6512

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e37b52
Share calendar to circle
viniciuscb Feb 7, 2019
34601f8
allow sharing addressbooks with circles
georgehrke Mar 1, 2019
58c92e6
Get user's circles without touching session
viniciuscb Mar 1, 2019
dc26d94
properly catch exceptions of detailsCircle
georgehrke Mar 3, 2019
12d3f24
use class_exists on correct class to please phan
georgehrke Mar 3, 2019
8322cec
Suppress phan exceptions because they are catched by a class_exists
MorrisJobke Mar 5, 2019
789aaa4
Fix whitespace
MorrisJobke Mar 5, 2019
dd2496b
Use proper dependency injection for app manager
MorrisJobke Mar 5, 2019
c8aad3d
Fix PHPUnit
MorrisJobke Mar 12, 2019
5cc5107
Fix PHPUnit
MorrisJobke Mar 12, 2019
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
Prev Previous commit
Next Next commit
Get user's circles without touching session 
This works with nextcloud/circles#260

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
  • Loading branch information
@viniciuscb
viniciuscb committed Mar 1, 2019
commit 58c92e604761901964a35f33a00acd5339536cbc
7 changes: 1 addition & 6 deletions apps/dav/lib/Connector/Sabre/Principal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,7 @@ public function getCircleMembership($principal):array {
throw new Exception('Principal not found');
}

$userSession = \OC::$server->getUserSession();
$currentUser = $userSession->getUser();

$userSession->setUser($user);
$circles = \OCA\Circles\Api\v1\Circles::joinedCircles();
$userSession->setUser($currentUser);
$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);

$circles = array_map(function($circle) {
/** @var \OCA\Circles\Model\Circle $group */
Expand Down