Skip to content

Commit aa06e1d

Browse files
committed
Fixed exception when trying to export an empty entity list
Fixes issue #836
1 parent fd7a015 commit aa06e1d

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

src/Controller/AdminPages/BaseAdminController.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,11 @@ protected function _exportAll(EntityManagerInterface $em, EntityExporter $export
467467
$this->denyAccessUnlessGranted('read', $entity);
468468
$entities = $em->getRepository($this->entity_class)->findAll();
469469

470+
if (count($entities) === 0) {
471+
$this->addFlash('error', 'entity.export.flash.error.no_entities');
472+
return $this->redirectToRoute($this->route_base.'_new');
473+
}
474+
470475
return $exporter->exportEntityFromRequest($entities, $request);
471476
}
472477

src/Controller/PartImportExportController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ public function exportParts(Request $request, EntityExporter $entityExporter): R
112112
$ids = $request->query->get('ids', '');
113113
$parts = $this->partsTableActionHandler->idStringToArray($ids);
114114

115-
if ($parts === []) {
116-
throw new \RuntimeException('No parts found!');
115+
if (count($parts) === 0) {
116+
$this->addFlash('error', 'entity.export.flash.error.no_entities');
117+
return $this->redirectToRoute('homepage');
117118
}
118119

119120
//Ensure that we have access to the parts

translations/messages.en.xlf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12323,5 +12323,11 @@ Please note, that you can not impersonate a disabled user. If you try you will g
1232312323
<target>Profile saved!</target>
1232412324
</segment>
1232512325
</unit>
12326+
<unit id="8C9ijHM" name="entity.export.flash.error.no_entities">
12327+
<segment>
12328+
<source>entity.export.flash.error.no_entities</source>
12329+
<target>There are no entities to export!</target>
12330+
</segment>
12331+
</unit>
1232612332
</file>
1232712333
</xliff>

0 commit comments

Comments
 (0)