Skip to content

Commit

Permalink
follow up changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kingjia90 committed Oct 30, 2024
1 parent 5f18d5a commit a49a6f7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function getFieldsAction(Request $request, Service $service): JsonRespons
*/
public function gridProxyAction(Request $request, Service $service, EventDispatcherInterface $eventDispatcher): JsonResponse | Response
{
$requestedLanguage = $request->request->get('language');
$requestedLanguage = $request->request->getString('language');
if ($requestedLanguage) {
if ($requestedLanguage != 'default') {
$request->setLocale($requestedLanguage);
Expand All @@ -103,7 +103,7 @@ public function gridProxyAction(Request $request, Service $service, EventDispatc
$requestedLanguage = $request->getLocale();
}

if ($request->request->get('data')) {
if ($request->request->has('data')) {
return $this->forward('Pimcore\Bundle\AdminBundle\Controller\Admin\DataObject\DataObjectController::gridProxyAction', [], $request->query->all());
} else {

Expand Down Expand Up @@ -177,7 +177,7 @@ public function getBatchJobsAction(Request $request, Service $service): JsonResp
$request->setLocale($request->request->getString('language'));
}

$class = DataObject\ClassDefinition::getById($request->request->get('classId'));
$class = DataObject\ClassDefinition::getById($request->request->getString('classId'));

$data = json_decode($request->request->getString('filter'), true);
$results = $service->doFilter($data['classId'], $data['conditions']['filters'] ?? [], $data['conditions']['fulltextSearchTerm'] ?? [], null, 9999);
Expand Down Expand Up @@ -215,7 +215,7 @@ public function getExportJobsAction(Request $request, Service $service): JsonRes
$request->setLocale($request->request->getString('language'));
}

$data = json_decode($request->request->get('filter'), true);
$data = json_decode($request->request->getString('filter'), true);

if (empty($ids = $request->request->all('ids'))) {
$ids = $service->getIdsFromFilterNoLimit(
Expand Down

0 comments on commit a49a6f7

Please sign in to comment.