kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Update packages.

Browse Source
This commit is contained in:
James Cole
2022-03-30 20:09:19 +02:00
parent 1211a5c878
commit 3120e29940
14 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V1/Controllers/System/ConfigurationController.php
View File

@@ -30,6 +30,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Binder\EitherConfigKey;
use Illuminate\Http\JsonResponse;
use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/**
* Class ConfigurationController
@@ -94,8 +96,8 @@ class ConfigurationController extends Controller
*
* @return array
* @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
private function getDynamicConfiguration(): array
{

2
app/Api/V1/Controllers/System/UserController.php
View File

@@ -81,7 +81,7 @@ class UserController extends Controller
return response()->json([], 500);
}
if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) {
if ($this->repository->hasRole($admin, 'owner')) {
$this->repository->destroy($user);
return response()->json([], 204);