Skip to content
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

Jump to bottom

TTK-27121 update opencast bundle #26

Merged
merged 5 commits into from
Sep 27, 2024
Merged

TTK-27121 update opencast bundle #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
362b9de
Change default player and fix errors
albacodina Jul 29, 2024
f835cef
Change access to a property
albacodina Jul 29, 2024
08be80a
Fix php-cs-fixer error
albacodina Jul 30, 2024
0de0218
Fix php-cs-fixer error
albacodina Jul 30, 2024
22808df
TTK-27131: Fix paginator oc-importer
albacodina Aug 29, 2024
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
6 changes: 3 additions & 3 deletions Controller/MediaPackageController.php
View file
Open in desktop
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
View file
Open in desktop
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
Loading