Skip to content

Commit

Permalink
Merge pull request #1174 from nextcloud/feat/transfer-guest-action
Browse files Browse the repository at this point in the history
feat: Allow transferring guests to full accounts
  • Loading branch information
Pytal authored Jul 15, 2024
2 parents 16bbb95 + e72ee8d commit 2ff709a
Show file tree
Hide file tree
Showing 15 changed files with 1,675 additions and 840 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module.exports = {
appName: true,
},
extends: [
'@nextcloud',
'@nextcloud/eslint-config/typescript',
],
}
2 changes: 1 addition & 1 deletion appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
[
'name' => 'users#transfer',
'url' => '/api/v1/transfer',
'verb' => 'PUT'
'verb' => 'POST',
],
[
'name' => 'API#languages',
Expand Down
3 changes: 3 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@
use OCA\Guests\Capabilities;
use OCA\Guests\GroupBackend;
use OCA\Guests\Hooks;
use OCA\Guests\Listener\BeforeUserManagementRenderedListener;
use OCA\Guests\Listener\LoadAdditionalScriptsListener;
use OCA\Guests\Listener\ShareAutoAcceptListener;
use OCA\Guests\Listener\TalkIntegrationListener;
use OCA\Guests\Notifications\Notifier;
use OCA\Guests\RestrictionManager;
use OCA\Guests\UserBackend;
use OCA\Settings\Events\BeforeTemplateRenderedEvent as BeforeUserManagementRenderedEvent;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
Expand Down Expand Up @@ -58,6 +60,7 @@ public function register(IRegistrationContext $context): void {
$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener::class);
$context->registerEventListener(ShareCreatedEvent::class, ShareAutoAcceptListener::class);
$context->registerEventListener(BeforeTemplateRenderedEvent::class, TalkIntegrationListener::class);
$context->registerEventListener(BeforeUserManagementRenderedEvent::class, BeforeUserManagementRenderedListener::class);
}

public function boot(IBootContext $context): void {
Expand Down
28 changes: 28 additions & 0 deletions lib/Listener/BeforeUserManagementRenderedListener.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Guests\Listener;

use OCA\Settings\Events\BeforeTemplateRenderedEvent;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\Util;

/**
* @template-implements IEventListener<BeforeTemplateRenderedEvent>
*/
class BeforeUserManagementRenderedListener implements IEventListener {
public function handle(Event $event): void {
if (!($event instanceof BeforeTemplateRenderedEvent)) {
return;
}

Util::addScript('guests', 'guests-users');
}
}
Loading

0 comments on commit 2ff709a

Please sign in to comment.