Merge pull request #2060 from nextcloud/fix/access_migration

fix: `legacyLink` access handling
nextcloud · Apr 15, 2024 · 3f82fb1 · 3f82fb1
2 parents 1ba3a14 + 52916f6
commit 3f82fb1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/Db/Form.php b/lib/Db/Form.php
@@ -133,7 +133,7 @@ public function setAccess(array $access) {
 		}
 
 		// If legacyLink add 3
-		if (isset($access['legacyLink'])) {
+		if (isset($access['legacyLink']) && $access['legacyLink']) {
 			$value += Constants::FORM_ACCESS_LEGACYLINK;
 		}
 

diff --git a/lib/Migration/Version040200Date20240402200139.php b/lib/Migration/Version040200Date20240402200139.php
@@ -27,6 +27,7 @@
 namespace OCA\Forms\Migration;
 
 use Closure;
+use OCA\Forms\Constants;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\DB\Types;
@@ -95,22 +96,22 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 			// Decode access to array (param assoc=true)
 			$access = json_decode($row['access_json'], true);
 
-			$value = 0;
+			$value = Constants::FORM_ACCESS_NOPUBLICSHARE;
 
 			// No further permissions -> 0
 			// Permit all users, but don't show in navigation -> 1
 			// Permit all users and show in navigation -> 2
 			if (!$access['permitAllUsers'] && !$access['showToAllUsers']) {
-				$value = 0;
+				$value = Constants::FORM_ACCESS_NOPUBLICSHARE;
 			} elseif ($access['permitAllUsers'] && !$access['showToAllUsers']) {
-				$value = 1;
+				$value = Constants::FORM_ACCESS_PERMITALLUSERS;
 			} else {
-				$value = 2;
+				$value = Constants::FORM_ACCESS_SHOWTOALLUSERS;
 			}
 
 			// If legacyLink add 3
-			if ($access['legacyLink']) {
-				$value += 3;
+			if (isset($access['legacyLink']) && $access['legacyLink']) {
+				$value += Constants::FORM_ACCESS_LEGACYLINK;
 			}
 
 			$qbUpdate->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)