Skip to content

Suppress exceptions on viewMultiple in case some of the rows are visible #1022

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

Open
bitamar wants to merge 1 commit into
base: 7.x-2.x
Choose a base branch
from
Open

Suppress exceptions on viewMultiple in case some of the rows are visible #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions src/Plugin/resource/DataProvider/CacheDecoratedDataProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,22 +193,29 @@ public function view($identifier) {

/**
* {@inheritdoc}
*
* @throws \Exception
* In case there's no content to show, and some exceptions where thrown
* from view(), then the last exception will be thrown.
*/
public function viewMultiple(array $identifiers) {
$return = array();
// If no IDs were requested, we should not throw an exception in case an
// entity is un-accessible by the user.
$rows = array();

foreach ($identifiers as $identifier) {
try {
$row = $this->view($identifier);
$rows[] = $this->view($identifier);
}
catch (InaccessibleRecordException $e) {
$row = NULL;
catch (\Exception $e) {
// Ignore the exceptions in case some content is visible, to allow
// partial success.
}
$return[] = $row;
}
if (!$rows && isset($e)) {
// Re-through the last exception in case no content is visible.
throw $e;
}

return array_values(array_filter($return));
return $rows;
}

/**
Expand Down
23 changes: 15 additions & 8 deletions src/Plugin/resource/DataProvider/DataProviderEntity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,22 +269,29 @@ public function view($identifier) {

/**
* {@inheritdoc}
*
* @throws \Exception
* In case there's no content to show, and some exceptions where thrown
* from view(), then the last exception will be thrown.
*/
public function viewMultiple(array $identifiers) {
$return = array();
// If no IDs were requested, we should not throw an exception in case an
// entity is un-accessible by the user.
$rows = array();

foreach ($identifiers as $identifier) {
try {
$row = $this->view($identifier);
$rows[] = $this->view($identifier);
}
catch (InaccessibleRecordException $e) {
$row = NULL;
catch (\Exception $e) {
// Ignore the exceptions in case some content is visible, to allow
// partial success.
}
$return[] = $row;
}
if (!$rows && isset($e)) {
// Re-through the last exception in case no content is visible.
throw $e;
}

return array_values(array_filter($return));
return $rows;
}

/**
Expand Down