kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Make sure error is still visible.

Browse Source
This commit is contained in:
James Cole
2022-01-02 08:01:59 +01:00
parent 5320480767
commit 45cfb4e565
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/CurrencyController.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
@@ -210,10 +211,9 @@ class CurrencyController extends Controller
* @param Request $request * @param Request $request
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return RedirectResponse|Redirector
* @throws FireflyException * @throws FireflyException
*/ */
public function disableCurrency(Request $request) public function disableCurrency(Request $request): JsonResponse
{ {
$currencyId = (int)$request->get('id'); $currencyId = (int)$request->get('id');
if ($currencyId > 0) { if ($currencyId > 0) {
@@ -228,8 +228,7 @@ class CurrencyController extends Controller
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => e(config('firefly.site_owner'))])); $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => e(config('firefly.site_owner'))]));
Log::channel('audit')->info(sprintf('Tried to disable currency %s but is not site owner.', $currency->code)); Log::channel('audit')->info(sprintf('Tried to disable currency %s but is not site owner.', $currency->code));
return response()->json([]);
return redirect(route('currencies.index'));
} }
@@ -240,8 +239,7 @@ class CurrencyController extends Controller
$request->session()->flash('error', $message); $request->session()->flash('error', $message);
Log::channel('audit')->info(sprintf('Tried to disable currency %s but is in use.', $currency->code)); Log::channel('audit')->info(sprintf('Tried to disable currency %s but is in use.', $currency->code));
return response()->json([]);
return redirect(route('currencies.index'));
} }
$this->repository->disable($currency); $this->repository->disable($currency);
@@ -267,7 +265,7 @@ class CurrencyController extends Controller
} }
} }
return redirect(route('currencies.index')); return response()->json([]);
} }
/** /**