|
@@ -184,8 +184,7 @@ granularity), the passed query is ``null``.
|
|
|
|
|
|
public function batchActionMerge(ProxyQueryInterface $selectedModelQuery)
|
|
public function batchActionMerge(ProxyQueryInterface $selectedModelQuery)
|
|
{
|
|
{
|
|
- if (!$this->admin->isGranted('EDIT') || !$this->admin->isGranted('DELETE'))
|
|
|
|
- {
|
|
|
|
|
|
+ if (!$this->admin->isGranted('EDIT') || !$this->admin->isGranted('DELETE')) {
|
|
throw new AccessDeniedException();
|
|
throw new AccessDeniedException();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -198,7 +197,7 @@ granularity), the passed query is ``null``.
|
|
$this->addFlash('sonata_flash_info', 'flash_batch_merge_no_target');
|
|
$this->addFlash('sonata_flash_info', 'flash_batch_merge_no_target');
|
|
|
|
|
|
return new RedirectResponse(
|
|
return new RedirectResponse(
|
|
- $this->admin->generateUrl('list',$this->admin->getFilterParameters())
|
|
|
|
|
|
+ $this->admin->generateUrl('list', $this->admin->getFilterParameters())
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -216,14 +215,14 @@ granularity), the passed query is ``null``.
|
|
$this->addFlash('sonata_flash_error', 'flash_batch_merge_error');
|
|
$this->addFlash('sonata_flash_error', 'flash_batch_merge_error');
|
|
|
|
|
|
return new RedirectResponse(
|
|
return new RedirectResponse(
|
|
- $this->admin->generateUrl('list',$this->admin->getFilterParameters())
|
|
|
|
|
|
+ $this->admin->generateUrl('list', $this->admin->getFilterParameters())
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
$this->addFlash('sonata_flash_success', 'flash_batch_merge_success');
|
|
$this->addFlash('sonata_flash_success', 'flash_batch_merge_success');
|
|
|
|
|
|
return new RedirectResponse(
|
|
return new RedirectResponse(
|
|
- $this->admin->generateUrl('list',$this->admin->getFilterParameters())
|
|
|
|
|
|
+ $this->admin->generateUrl('list', $this->admin->getFilterParameters())
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|