ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3306 from nextcloud/backport/3299/stable22

Browse Source 
[stable22] Return false instead of throwing when getting calendar setting
This commit is contained in:
Julius Härtl
2021-09-08 18:28:57 +02:00
committed by GitHub
parent 585f0999a3 d51f645299
commit 0f71741c46
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Service/ConfigService.php
View File

@@ -82,21 +82,18 @@ class ConfigService {
if ($this->getUserId() === null || !$this->groupManager->isAdmin($this->getUserId())) {
throw new NoPermissionException('You must be admin to get the group limit');
}
$result = $this->getGroupLimit();
break;
return $this->getGroupLimit();
case 'calendar':
if ($this->getUserId() === null) {
throw new NoPermissionException('Must be logged in to get the group limit');
return false;
}
$result = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);
break;
return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);
}
return $result;
}
public function isCalendarEnabled(int $boardId = null): bool {
if ($this->getUserId() === null) {
throw new NoPermissionException('Must be logged in to access user config');
return false;
}
$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);