Skip to content
Snippets Groups Projects
Commit 0a9f0df5 authored by Timothee Gosselin's avatar Timothee Gosselin
Browse files

add patch for calendar resource management

parent 2aa532c9
No related branches found
No related tags found
No related merge requests found
Pipeline #1263 passed with stages
in 4 minutes and 23 seconds
......@@ -7,6 +7,7 @@ WORKDIR /apps
ARG MINOR_VERSION
RUN ./install.sh
RUN cd apps/mail && patch -p1 < ../../mail-enumeration-leak.patch
RUN cd apps/calendar_resource_management && patch -p1 < ../../calendar_resource_management.patch
RUN rm ./install.sh ./install-list ./mail-enumeration-leak.patch
FROM nextcloud:${MARKETTING_VERSION}-fpm-alpine
......
From 778e2f2ed0f04ca48a7dae104fb79ab501f12cc6 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 4 Feb 2022 11:18:28 +0100
Subject: [PATCH] Migrate to new backend registrations
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
lib/AppInfo/Application.php | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b12fbc6..7c5374e 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -32,8 +32,6 @@
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Group\Events\GroupDeletedEvent;
use OCP\User\Events\UserDeletedEvent;
-use OCP\Calendar\Resource\IManager as IResourceManager;
-use OCP\Calendar\Room\IManager as IRoomManager;
use OCA\CalendarResourceManagement\Connector;
class Application extends App implements IBootstrap {
@@ -56,6 +54,8 @@ public function __construct(array $urlParams = []) {
* @inheritDoc
*/
public function register(IRegistrationContext $context): void {
+ $context->registerCalendarResourceBackend(Connector\Resource\Backend::class);
+ $context->registerCalendarRoomBackend(Connector\Room\Backend::class);
$context->registerEventListener(GroupDeletedEvent::class, GroupDeletedListener::class);
$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
}
@@ -64,14 +64,5 @@ public function register(IRegistrationContext $context): void {
* @inheritDoc
*/
public function boot(IBootContext $context): void {
- $serverContainer = $context->getServerContainer();
-
- /** @var IResourceManager $resourceManager */
- /** @var IRoomManager $roomManager */
- $resourceManager = $serverContainer->get(IResourceManager::class);
- $roomManager = $serverContainer->get(IRoomManager::class);
-
- $resourceManager->registerBackend(Connector\Resource\Backend::class);
- $roomManager->registerBackend(Connector\Room\Backend::class);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment