From 362b9de835ea9b40bbacb62f84ab4a1cb83e5fbd Mon Sep 17 00:00:00 2001 From: Alba Date: Mon, 29 Jul 2024 18:36:58 +0200 Subject: [PATCH 1/5] Change default player and fix errors --- Controller/MediaPackageController.php | 2 +- Resources/doc/Configuration.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/MediaPackageController.php b/Controller/MediaPackageController.php index 469b887..8c9a5ac 100644 --- a/Controller/MediaPackageController.php +++ b/Controller/MediaPackageController.php @@ -121,7 +121,7 @@ public function importAction(Request $request, string $id): RedirectResponse throw new AccessDeniedException('Not allowed. Configure your OpencastBundle to show the Importer Tab.'); } - $this->opencastImportService->importRecording($id, $request->get('invert'), $this->getUser()); + $this->opencastImportService->importRecording($id, filter_var($request->get('invert'), FILTER_VALIDATE_BOOLEAN), $this->getUser()); if ($request->headers->get('referer')) { return $this->redirect($request->headers->get('referer')); diff --git a/Resources/doc/Configuration.md b/Resources/doc/Configuration.md index 03f6626..a492795 100644 --- a/Resources/doc/Configuration.md +++ b/Resources/doc/Configuration.md @@ -43,7 +43,7 @@ Mandatory: - `host` is the Opencast server URL (Engage node in cluster). - `username` is the name of the account used to operate the Opencast REST endpoints (org.opencastproject.security.digest.user). If empty, the connection is as an anonymous user. - `password` is the password for the account used to operate the Opencast REST endpoints (org.opencastproject.security.digest.pass). - - `player` is the Opencast player URL or path (default `/engage/ui/watch.html`). Use `/engage/theodul/ui/core.html` for Opencast 2.x and `/paella/ui/watch.html` if [paella player](http://paellaplayer.upv.es/) is being used. + - `player` is the Opencast player URL or path (default `/engage/ui/watch.html`). Use `/engage/theodul/ui/core.html` for Opencast 2.x and `/paella7/ui/watch.html` if [paella player](http://paellaplayer.upv.es/) is being used. Optional: - `default_tag_imported` set code of tag that you want to set when imports an mmo to PuMuKIT from Opencast. From f835cefd679a44493613b72b45de2cb4918946b0 Mon Sep 17 00:00:00 2001 From: Alba Date: Mon, 29 Jul 2024 18:54:46 +0200 Subject: [PATCH 2/5] Change access to a property --- Controller/MediaPackageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/MediaPackageController.php b/Controller/MediaPackageController.php index 8c9a5ac..ac49dcd 100644 --- a/Controller/MediaPackageController.php +++ b/Controller/MediaPackageController.php @@ -70,7 +70,7 @@ public function indexAction(Request $request): Response try { [$total, $mediaPackages] = $this->opencastClientService->getMediaPackages( - isset($criteria['name']) ? $criteria['name']->regex : '', + isset($criteria['name']) ? $criteria['name']->getPattern() : '', $limit, ($page - 1) * $limit ); From 08be80aa18b0520581e864a662f66f0ffcedd394 Mon Sep 17 00:00:00 2001 From: Alba Date: Tue, 30 Jul 2024 10:50:03 +0200 Subject: [PATCH 3/5] Fix php-cs-fixer error --- PumukitOpencastBundle.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PumukitOpencastBundle.php b/PumukitOpencastBundle.php index b9437d0..b724127 100644 --- a/PumukitOpencastBundle.php +++ b/PumukitOpencastBundle.php @@ -6,4 +6,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle; -class PumukitOpencastBundle extends Bundle {} +class PumukitOpencastBundle extends Bundle +{ +} \ No newline at end of file From 0de0218d66d8197125420a8d435732aee2eda002 Mon Sep 17 00:00:00 2001 From: Alba Date: Tue, 30 Jul 2024 11:17:02 +0200 Subject: [PATCH 4/5] Fix php-cs-fixer error --- PumukitOpencastBundle.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/PumukitOpencastBundle.php b/PumukitOpencastBundle.php index b724127..b9437d0 100644 --- a/PumukitOpencastBundle.php +++ b/PumukitOpencastBundle.php @@ -6,6 +6,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle; -class PumukitOpencastBundle extends Bundle -{ -} \ No newline at end of file +class PumukitOpencastBundle extends Bundle {} From 22808df1832759310d6fc99d676b4855d7400c53 Mon Sep 17 00:00:00 2001 From: Alba Date: Thu, 29 Aug 2024 13:31:12 +0200 Subject: [PATCH 5/5] TTK-27131: Fix paginator oc-importer --- Controller/MediaPackageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/MediaPackageController.php b/Controller/MediaPackageController.php index ac49dcd..8821989 100644 --- a/Controller/MediaPackageController.php +++ b/Controller/MediaPackageController.php @@ -95,7 +95,7 @@ public function indexAction(Request $request): Response $pics[$mediaPackage['id']] = $this->opencastService->getMediaPackageThumbnail($mediaPackage); } - $pager = $this->paginationService->createFixedAdapter($total, $mediaPackages, $page, $limit); + $pager = $this->paginationService->createFixedAdapter($total, $mediaPackages, (int) $page, $limit); $repo = $repository_multimediaObjects->createQueryBuilder() ->field('properties.opencast')->exists(true)