Skip to content

small edit #794

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
merged 2 commits into from
Oct 15, 2021
Merged

small edit #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
621cb63
small edit
ArtificialOwl Aug 23, 2021
358a00e
returns Membership
ArtificialOwl Aug 25, 2021
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: 11 additions & 3 deletions lib/Model/Circle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer
4 => 'Email Address',
8 => 'Contact',
16 => 'Circle',
10000 => 'Nextcloud App',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should lib/Application/Capabilities.php be updated as per the above comment?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already defined in https://github.com/nextcloud/circles/blob/master/lib/AppInfo/Capabilities.php#L178

10001 => 'Circles App',
10002 => 'Admin Command Line'
];
Expand Down Expand Up @@ -555,9 +556,7 @@ public function getMemberships(): array {
* @throws RequestBuilderException
*/
public function getLink(string $singleId, bool $detailed = false): Membership {
$this->getManager()->getLink($this, $singleId, $detailed);

throw new MembershipNotFoundException();
return $this->getManager()->getLink($this, $singleId, $detailed);
}


Expand Down Expand Up @@ -631,6 +630,15 @@ public function getInstance(): string {
}


/**
* @return bool
* @throws OwnerNotFoundException
*/
public function isLocal(): bool {
return $this->getManager()->isLocalInstance($this->getInstance());
}


/**
* @param int $population
*
Expand Down
7 changes: 7 additions & 0 deletions lib/Service/FederatedUserService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,13 @@ public function bypassCurrentUserCondition(bool $bypass): void {
$this->bypass = $bypass;
}

/**
* @return bool
*/
public function canBypassCurrentUserCondition(): bool {
return $this->bypass;
}


/**
* @param bool $initiatedByOcc
Expand Down