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

Minor misc fixes #1986

Merged
merged 9 commits into from
Aug 15, 2023
Merged

Minor misc fixes #1986

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ccf60d
Schedule : validate name field length
PeterMis Aug 15, 2023
fe74b12
Display : Filter by whether XMR is registered
PeterMis Aug 15, 2023
fb956c6
Display Group : show display name in the error on XMR send action
PeterMis Aug 15, 2023
2f15841
Commands : Add an option to execute command with selected on Displays…
PeterMis Aug 15, 2023
3ed347c
phpcs fixes.
PeterMis Aug 15, 2023
fbfadd2
phpcs fixes part 2.
PeterMis Aug 15, 2023
24f4cd8
phpcs fixes part 3.
PeterMis Aug 15, 2023
309c826
phpcs fixes part 4.
PeterMis Aug 15, 2023
e278db8
Player Actions : Fix translations
PeterMis Aug 15, 2023
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
66 changes: 49 additions & 17 deletions lib/Controller/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Copyright (C) 2021 Xibo Signage Ltd
/*
* Copyright (C) 2023 Xibo Signage Ltd
*
* Xibo - Digital Signage - http://www.xibo.org.uk
* Xibo - Digital Signage - https://xibosignage.com
*
* This file is part of Xibo.
*
Expand All @@ -27,7 +27,6 @@
use Slim\Http\ServerRequest as Request;
use Xibo\Event\CommandDeleteEvent;
use Xibo\Factory\CommandFactory;
use Xibo\Factory\DisplayProfileFactory;
use Xibo\Support\Exception\AccessDeniedException;
use Xibo\Support\Exception\ControllerNotImplemented;
use Xibo\Support\Exception\GeneralException;
Expand Down Expand Up @@ -85,10 +84,17 @@ public function displayPage(Request $request, Response $response)
* @SWG\Parameter(
* name="command",
* in="query",
* description="Filter by Command Name",
* description="Filter by Command Name, exact match",
* type="string",
* required=false
* ),
@SWG\Parameter(
* name="commandLike",
* in="query",
* description="Filter by Command Name, LIKE match",
* type="string",
* required=false
* ),
* @SWG\Parameter(
* name="code",
* in="query",
Expand All @@ -112,23 +118,28 @@ public function displayPage(Request $request, Response $response)
* @throws GeneralException
* @throws NotFoundException
*/
function grid(Request $request, Response $response)
public function grid(Request $request, Response $response)
{
$sanitzedParams = $this->getSanitizer($request->getParams());
$sanitizedParams = $this->getSanitizer($request->getParams());

$filter = [
'commandId' => $sanitzedParams->getInt('commandId'),
'command' => $sanitzedParams->getString('command'),
'code' => $sanitzedParams->getString('code')
'commandId' => $sanitizedParams->getInt('commandId'),
'command' => $sanitizedParams->getString('command'),
'code' => $sanitizedParams->getString('code'),
'commandLike' => $sanitizedParams->getString('commandLike'),
];

$commands = $this->commandFactory->query($this->gridRenderSort($sanitzedParams), $this->gridRenderFilter($filter, $sanitzedParams));
$commands = $this->commandFactory->query(
$this->gridRenderSort($sanitizedParams),
$this->gridRenderFilter($filter, $sanitizedParams)
);

foreach ($commands as $command) {
/* @var \Xibo\Entity\Command $command */

if ($this->isApi($request))
if ($this->isApi($request)) {
continue;
}

$command->includeProperty('buttons');

Expand All @@ -146,11 +157,14 @@ function grid(Request $request, Response $response)
if ($this->getUser()->checkDeleteable($command)) {
$command->buttons[] = [
'id' => 'command_button_delete',
'url' => $this->urlFor($request,'command.delete.form', ['id' => $command->commandId]),
'url' => $this->urlFor($request, 'command.delete.form', ['id' => $command->commandId]),
'text' => __('Delete'),
'multi-select' => true,
'dataAttributes' => [
['name' => 'commit-url', 'value' => $this->urlFor($request,'command.delete', ['id' => $command->commandId])],
[
'name' => 'commit-url',
'value' => $this->urlFor($request, 'command.delete', ['id' => $command->commandId])
],
['name' => 'commit-method', 'value' => 'delete'],
['name' => 'id', 'value' => 'command_button_delete'],
['name' => 'text', 'value' => __('Delete')],
Expand All @@ -165,18 +179,36 @@ function grid(Request $request, Response $response)
// Permissions button
$command->buttons[] = [
'id' => 'command_button_permissions',
'url' => $this->urlFor($request,'user.permissions.form', ['entity' => 'Command', 'id' => $command->commandId]),
'url' => $this->urlFor(
$request,
'user.permissions.form',
['entity' => 'Command', 'id' => $command->commandId]
),
'text' => __('Share'),
'multi-select' => true,
'dataAttributes' => [
['name' => 'commit-url', 'value' => $this->urlFor($request,'user.permissions.multi', ['entity' => 'Command', 'id' => $command->commandId])],
[
'name' => 'commit-url',
'value' => $this->urlFor(
$request,
'user.permissions.multi',
['entity' => 'Command', 'id' => $command->commandId]
)
],
['name' => 'commit-method', 'value' => 'post'],
['name' => 'id', 'value' => 'command_button_permissions'],
['name' => 'text', 'value' => __('Share')],
['name' => 'rowtitle', 'value' => $command->command],
['name' => 'sort-group', 'value' => 2],
['name' => 'custom-handler', 'value' => 'XiboMultiSelectPermissionsFormOpen'],
['name' => 'custom-handler-url', 'value' => $this->urlFor($request,'user.permissions.multi.form', ['entity' => 'Command'])],
[
'name' => 'custom-handler-url',
'value' => $this->urlFor(
$request,
'user.permissions.multi.form',
['entity' => 'Command']
)
],
['name' => 'content-id-name', 'value' => 'commandId']
]
];
Expand Down
Loading
Loading