fix: Only skip failing table data loading instead of full failure

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 15, 2024 · a12dd7d · a12dd7d
1 parent 159d2ec
commit a12dd7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
@@ -271,6 +271,9 @@ private function getFilter(IQueryBuilder &$qb, array $filterGroup): array {
 		$filterExpressions = [];
 		foreach ($filterGroup as $filter) {
 			$columnId = $filter['columnId'];
+			if (!isset($this->columns[$columnId]) && !isset($this->allColumns[$columnId])) {
+				throw new InternalError('No column found to build filter with for id ' . $columnId);
+			}
 			$column = $this->columns[$columnId] ?? $this->allColumns[$columnId];
 
 			// if is normal column

diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
@@ -124,7 +124,6 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 					$this->enhanceTable($table, $userId);
 				} catch (InternalError|PermissionError $e) {
 					$this->logger->error($e->getMessage(), ['exception' => $e]);
-					throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
 				}
 				// if the table is shared with me, there are no other shares
 				// will avoid showing the shared icon in the FE nav