Skip to content

[stable0.9] fix: view filter #2693

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
backportbot wants to merge 1 commit into
base: stable0.9
Choose a base branch
from
+21 −1
Open

[stable0.9] fix: view filter #2693

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
22 changes: 21 additions & 1 deletion lib/Service/RowService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,15 @@ public function findAllByView(int $viewId, string $userId, ?int $limit = null, ?
if ($this->permissionsService->canReadRowsByElementId($viewId, 'view', $userId)) {
$view = $this->viewMapper->find($viewId);

return $this->row2Mapper->findAll($view->getColumnIds(), $view->getTableId(), $limit, $offset, $view->getFilterArray(), $view->getSortArray(), $userId);
return $this->row2Mapper->findAll(
$view->getColumnIds(),
$view->getTableId(),
$limit,
$offset,
$view->getFilterArray(),
$view->getSortArray(),
$this->resolveFilterUserId($userId, $view),
);
} else {
throw new PermissionError('no read access to view id = ' . $viewId);
}
Expand All @@ -114,6 +122,18 @@ public function findAllByView(int $viewId, string $userId, ?int $limit = null, ?
}


/**
* resolve user id used for field placeholders in view filters.
* if no user is in context (public link), use the view owner as fallback.
*/
private function resolveFilterUserId(string $userId, View $view): string {
if (in_array($userId, ['', null], true)) {
return $view->getCreatedBy() ?? '';
}

return $userId;
}

/**
* @param int $rowId
* @return Row2
Expand Down
Loading