Skip to content

Commit

Permalink
TTK-27121 update opencast bundle (#26)
Browse files Browse the repository at this point in the history
* Change default player and fix errors

* Change access to a property

* Fix php-cs-fixer error

* Fix php-cs-fixer error

* TTK-27131: Fix paginator oc-importer

---------

Co-authored-by: Alba <[email protected]>
  • Loading branch information
Yurujai and albacodina authored Sep 27, 2024
1 parent 7b3cda1 commit 67b9b2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Controller/MediaPackageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand All @@ -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)
Expand All @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion Resources/doc/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 67b9b2a

Please sign in to comment.