fix: permission bug fixes, apply additional frontend filters

Signed-off-by: Philipp Hempel <Philipp.Hempel1@web.de>
nextcloud · Jul 27, 2023 · 453f23d · 453f23d
1 parent dab3f20
commit 453f23d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
@@ -175,12 +175,31 @@ public function canUpdateRowsByViewId(int $viewId, ?string $userId = null): bool
 		return $this->checkPermissionById($viewId, 'view', 'update', $userId);
 	}
 
+	/**
+	 * @param int $tableId
+	 * @param string|null $userId
+	 * @return bool
+	 */
+	public function canUpdateRowsByTableId(int $tableId, ?string $userId = null): bool {
+		return $this->checkPermissionById($tableId, 'table', 'manage', $userId);
+	}
+
+
 	/**
 	 * @param int $tableId
 	 * @param string|null $userId
 	 * @return bool
 	 */
 	public function canDeleteRowsByViewId(int $viewId, ?string $userId = null): bool {
+		return $this->checkPermissionById($tableId, 'table', 'manage', $userId);
+	}
+
+	/**
+	 * @param int $tableId
+	 * @param string|null $userId
+	 * @return bool
+	 */
+	public function canDeleteRowsByTableId(int $viewId, ?string $userId = null): bool {
 		return $this->checkPermissionById($viewId, 'view', 'delete', $userId);
 	}
 

diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -236,15 +236,23 @@ export default {
 				data.data.columns = JSON.stringify(this.columns.map(col => col.id))
 			}
 			if (this.viewSetting.sorting) {
-				data.data.sort = JSON.stringify([this.viewSetting.sorting[0]])
+				data.data.sort = JSON.stringify([...this.view.sort, this.viewSetting.sorting[0]])
 			}
 			if (this.viewSetting.filter && this.viewSetting.filter.length !== 0) {
-				const filteringRules = [this.viewSetting.filter.map(fil => ({
+				const filteringRules = this.viewSetting.filter.map(fil => ({
 					columnId: fil.columnId,
 					operator: fil.operator.id,
 					value: fil.value,
-				}))]
-				data.data.filter = JSON.stringify(filteringRules)
+				}))
+				const newFilter = []
+				if (this.view.filter && this.view.filter.length !== 0) {
+					this.view.filter.forEach(filterGroup => {
+						newFilter.push([...filterGroup, ...filteringRules])
+					})
+				} else {
+					newFilter[0] = filteringRules
+				}
+				data.data.filter = JSON.stringify(newFilter)
 			}
 			return data
 		},