Merge pull request #456 from nextcloud/fix/smoke-test-bugs

nextcloud · Aug 14, 2023 · 44c67f1 · 44c67f1
2 parents 5e2aead + 3c45c4a
commit 44c67f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lib/Db/ColumnTypes/SelectionColumnQB.php b/lib/Db/ColumnTypes/SelectionColumnQB.php
@@ -2,5 +2,10 @@
 
 namespace OCA\Tables\Db\ColumnTypes;
 
+use OCP\DB\QueryBuilder\IQueryBuilder;
+
 class SelectionColumnQB extends SuperColumnQB implements IColumnTypeQB {
+	public function passSearchValue(IQueryBuilder $qb, string $unformattedSearchValue, string $operator, string $searchValuePlaceHolder): void {
+		$qb->setParameter($searchValuePlaceHolder, $unformattedSearchValue, IQueryBuilder::PARAM_STR);
+	}
 }
diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
@@ -240,7 +240,7 @@ public function canReadRowsByElement($element, string $nodeType, ?string $userId
 	 */
 	public function canCreateRows($element, string $nodeType = 'view', ?string $userId = null): bool {
 		if ($nodeType === 'table') {
-			return $this->checkPermission($element, 'table', 'manage', $userId);
+			return $this->checkPermission($element, 'table', 'create', $userId);
 		}
 		return $this->checkPermission($element, 'view', 'create', $userId);
 	}
@@ -260,7 +260,7 @@ public function canUpdateRowsByViewId(int $viewId, ?string $userId = null): bool
 	 * @return bool
 	 */
 	public function canUpdateRowsByTableId(int $tableId, ?string $userId = null): bool {
-		return $this->checkPermissionById($tableId, 'table', 'manage', $userId);
+		return $this->checkPermissionById($tableId, 'table', 'update', $userId);
 	}
 
 
@@ -279,7 +279,7 @@ public function canDeleteRowsByViewId(int $viewId, ?string $userId = null): bool
 	 * @return bool
 	 */
 	public function canDeleteRowsByTableId(int $tableId, ?string $userId = null): bool {
-		return $this->checkPermissionById($tableId, 'table', 'manage', $userId);
+		return $this->checkPermissionById($tableId, 'table', 'delete', $userId);
 
 	}
 

diff --git a/src/shared/components/ncTable/mixins/filter.js b/src/shared/components/ncTable/mixins/filter.js
@@ -49,26 +49,26 @@ export const Filters = {
 	Contains: new Filter({
 		id: FilterIds.Contains,
 		label: t('tables', 'Contains'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.TextLink, ColumnTypes.TextRich],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.TextLink, ColumnTypes.TextRich],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual],
 	}),
 	BeginsWith: new Filter({
 		id: FilterIds.BeginsWith,
 		label: t('tables', 'Begins with'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.TextLink],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLink],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith],
 	}),
 	EndsWith: new Filter({
 		id: FilterIds.EndsWith,
 		label: t('tables', 'Ends with'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.TextLink],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLink],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.EndsWith],
 	}),
 	IsEqual: new Filter({
 		id: FilterIds.IsEqual,
 		label: t('tables', 'Is equal'),
 		shortLabel: '=',
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
 	}),
 	IsGreaterThan: new Filter({
@@ -102,7 +102,7 @@ export const Filters = {
 	IsEmpty: new Filter({
 		id: FilterIds.IsEmpty,
 		label: t('tables', 'Is empty'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.NumberStars, ColumnTypes.SelectionCheck],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.NumberStars, ColumnTypes.SelectionCheck],
 		incompatibleWith: [FilterIds.Contains, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual, FilterIds.IsEmpty],
 		noSearchValue: true,
 	}),