Merge pull request #9763 from hillelcoren/v5-develop

Fix for 'Table ninja.accounts doesn't exist'
This commit is contained in:
David Bomba 2024-07-11 21:12:41 +10:00 committed by GitHub
commit bfe5e28ecf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions

View File

@ -35,6 +35,7 @@ use League\Fractal\Resource\Item;
use App\Models\BankTransactionRule; use App\Models\BankTransactionRule;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Transformers\ArraySerializer; use App\Transformers\ArraySerializer;
use Illuminate\Support\Facades\Schema as DbSchema;
use App\Transformers\EntityTransformer; use App\Transformers\EntityTransformer;
use League\Fractal\Resource\Collection; use League\Fractal\Resource\Collection;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
@ -1106,7 +1107,7 @@ class BaseController extends Controller
public function flutterRoute() public function flutterRoute()
{ {
if ((bool) $this->checkAppSetup() !== false && $account = Account::first()) { if ((bool) $this->checkAppSetup() !== false && DbSchema::hasTable('accounts') && $account = Account::first()) {
/** @var \App\Models\Account $account */ /** @var \App\Models\Account $account */

View File

@ -83,6 +83,7 @@ class SystemHealth
'pdf_engine' => (string) self::getPdfEngine(), 'pdf_engine' => (string) self::getPdfEngine(),
'queue' => (string) config('queue.default'), 'queue' => (string) config('queue.default'),
'queue_data' => self::checkQueueData(), 'queue_data' => self::checkQueueData(),
'jobs_pending' => 0, // TODO for backwards compatibility, remove once Flutter AP is updated
'trailing_slash' => (bool) self::checkUrlState(), 'trailing_slash' => (bool) self::checkUrlState(),
'file_permissions' => (string) ($check_file_system ? self::checkFileSystem() : ''), 'file_permissions' => (string) ($check_file_system ? self::checkFileSystem() : ''),
'exchange_rate_api_not_configured' => (bool)self::checkCurrencySanity(), 'exchange_rate_api_not_configured' => (bool)self::checkCurrencySanity(),