mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Better error messages [skip ci]
This commit is contained in:
parent
0c99248deb
commit
d9ca7b7277
@ -73,7 +73,7 @@ class IndexController extends Controller
|
|||||||
{
|
{
|
||||||
// can only create "fake" for demo user.
|
// can only create "fake" for demo user.
|
||||||
$providers = array_keys($this->getProviders());
|
$providers = array_keys($this->getProviders());
|
||||||
if (!in_array($importProvider, $providers, true)) {
|
if (!\in_array($importProvider, $providers, true)) {
|
||||||
session()->flash('warning', trans('import.cannot_create_for_provider', ['provider' => $importProvider]));
|
session()->flash('warning', trans('import.cannot_create_for_provider', ['provider' => $importProvider]));
|
||||||
|
|
||||||
return redirect(route('import.index'));
|
return redirect(route('import.index'));
|
||||||
|
@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Import;
|
|||||||
|
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Http\Controllers\Controller;
|
use FireflyIII\Http\Controllers\Controller;
|
||||||
use FireflyIII\Http\Middleware\IsDemoUser;
|
|
||||||
use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
|
use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
|
||||||
use FireflyIII\Models\ImportJob;
|
use FireflyIII\Models\ImportJob;
|
||||||
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||||
@ -75,7 +74,7 @@ class PrerequisitesController extends Controller
|
|||||||
// catch impossible status:
|
// catch impossible status:
|
||||||
$allowed = ['new'];
|
$allowed = ['new'];
|
||||||
if (null !== $importJob && !in_array($importJob->status, $allowed)) {
|
if (null !== $importJob && !in_array($importJob->status, $allowed)) {
|
||||||
Log::error('Job is not new but wants to do prerequisites');
|
Log::error(sprintf('Job has state "%s" but this Prerequisites::index() only accepts %s', $importJob->status, json_encode($allowed)));
|
||||||
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
|
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
|
||||||
|
|
||||||
return redirect(route('import.index'));
|
return redirect(route('import.index'));
|
||||||
@ -128,8 +127,8 @@ class PrerequisitesController extends Controller
|
|||||||
|
|
||||||
// catch impossible status:
|
// catch impossible status:
|
||||||
$allowed = ['new'];
|
$allowed = ['new'];
|
||||||
if (null !== $importJob && !in_array($importJob->status, $allowed)) {
|
if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) {
|
||||||
Log::error('Job is not new but wants to do prerequisites');
|
Log::error(sprintf('Job has state "%s" but this Prerequisites::post() only accepts %s', $importJob->status, json_encode($allowed)));
|
||||||
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
|
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
|
||||||
|
|
||||||
return redirect(route('import.index'));
|
return redirect(route('import.index'));
|
||||||
|
Loading…
Reference in New Issue
Block a user