Skip to content

[stable15] Add activities for group membership changes #14534

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 3 commits into from
Mar 8, 2019
Merged

[stable15] Add activities for group membership changes #14534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c67f36
Add activities for group membership changes
nickvergessen Mar 4, 2019
e828bfc
Update autoloader
nickvergessen Mar 5, 2019
fee02bb
Fix unit tests
nickvergessen Mar 6, 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
Fix unit tests 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Mar 7, 2019
commit fee02bbcaa332cf8002f1771fb23a7974d00240e
6 changes: 3 additions & 3 deletions settings/Activity/GroupProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

class GroupProvider implements IProvider {

public const ADDED_TO_GROUP = 'group_added';
public const REMOVED_FROM_GROUP = 'group_removed';
const ADDED_TO_GROUP = 'group_added';
const REMOVED_FROM_GROUP = 'group_removed';

/** @var L10nFactory */
private $l10n;
Expand Down Expand Up @@ -132,7 +132,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
* @param array $parameters
* @throws \InvalidArgumentException
*/
protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
protected function setSubjects(IEvent $event, string $subject, array $parameters) {
$placeholders = $replacements = [];
foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}';
Expand Down
5 changes: 2 additions & 3 deletions settings/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
use OCP\Defaults;
use OCP\IContainer;
use OCP\IGroup;
use OCP\ILogger;
use OCP\IUser;
use OCP\Settings\IManager;
use OCP\Util;
Expand Down Expand Up @@ -136,14 +135,14 @@ public function register() {
Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
}

public function addUserToGroup(IGroup $group, IUser $user): void {
public function addUserToGroup(IGroup $group, IUser $user) {
/** @var Hooks $hooks */
$hooks = $this->getContainer()->query(Hooks::class);
$hooks->addUserToGroup($group, $user);

}

public function removeUserFromGroup(IGroup $group, IUser $user): void {
public function removeUserFromGroup(IGroup $group, IUser $user) {
/** @var Hooks $hooks */
$hooks = $this->getContainer()->query(Hooks::class);
$hooks->removeUserFromGroup($group, $user);
Expand Down
4 changes: 2 additions & 2 deletions settings/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
* @throws \InvalidArgumentException
* @throws \BadMethodCallException
*/
public function addUserToGroup(IGroup $group, IUser $user): void {
public function addUserToGroup(IGroup $group, IUser $user) {
$subAdminManager = $this->groupManager->getSubAdmin();
$usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
$usersToNotify[] = $user;
Expand Down Expand Up @@ -261,7 +261,7 @@ public function addUserToGroup(IGroup $group, IUser $user): void {
* @throws \InvalidArgumentException
* @throws \BadMethodCallException
*/
public function removeUserFromGroup(IGroup $group, IUser $user): void {
public function removeUserFromGroup(IGroup $group, IUser $user) {
$subAdminManager = $this->groupManager->getSubAdmin();
$usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
$usersToNotify[] = $user;
Expand Down