Merge pull request #1348 from nextcloud/backport/1334/stable21

[stable21] Fix deletion failing even if there's an entry in the folder listing
nextcloud · Mar 5, 2021 · 6086182 · 6086182
2 parents 4428ad1 + ec39e73
commit 6086182
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/lib/Command/Group.php b/lib/Command/Group.php
@@ -70,23 +70,21 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		if ($folder) {
 			$groupString = $input->getArgument('group');
 			$group = $this->groupManager->get($groupString);
-			if ($group) {
-				if ($input->getOption('delete')) {
-					$this->folderManager->removeApplicableGroup($folderId, $groupString);
+			if ($input->getOption('delete')) {
+				$this->folderManager->removeApplicableGroup($folderId, $groupString);
+				return 0;
+			} elseif ($group) {
+				$permissionsString = $input->getArgument('permissions');
+				$permissions = $this->getNewPermissions($permissionsString);
+				if ($permissions) {
+					if (!isset($folder['groups'][$groupString])) {
+						$this->folderManager->addApplicableGroup($folderId, $groupString);
+					}
+					$this->folderManager->setGroupPermissions($folderId, $groupString, $permissions);
 					return 0;
 				} else {
-					$permissionsString = $input->getArgument('permissions');
-					$permissions = $this->getNewPermissions($permissionsString);
-					if ($permissions) {
-						if (!isset($folder['groups'][$groupString])) {
-							$this->folderManager->addApplicableGroup($folderId, $groupString);
-						}
-						$this->folderManager->setGroupPermissions($folderId, $groupString, $permissions);
-						return 0;
-					} else {
-						$output->writeln('<error>Unable to parse permissions input: ' . implode(' ', $permissionsString) . '</error>');
-						return -1;
-					}
+					$output->writeln('<error>Unable to parse permissions input: ' . implode(' ', $permissionsString) . '</error>');
+					return -1;
 				}
 			} else {
 				$output->writeln('<error>group not found: ' . $groupString . '</error>');