Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable21] Fix deletion failing even if there's an entry in the folder listing #1348

Merged
merged 1 commit into from Mar 5, 2021
Merged

[stable21] Fix deletion failing even if there's an entry in the folder listing #1348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 13 additions & 15 deletions lib/Command/Group.php
View file
Open in desktop
Expand Up @@ -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>');
Expand Down