Fix view for transaction controller.

This commit is contained in:
James Cole
2018-04-16 19:25:33 +02:00
parent ecdc00dcb7
commit 1a8293d9ef
2 changed files with 22 additions and 14 deletions

View File

@@ -228,7 +228,6 @@ class TransactionController extends Controller
$what = strtolower($transactionType);
$subTitle = trans('firefly.' . $what) . ' "' . $journal->description . '"';
var_dump($transactions);exit;
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links'));
}

View File

@@ -24,8 +24,10 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Contracts\Auth\Factory as Auth;
use Illuminate\Database\QueryException;
/**
* Class Authenticate
@@ -76,12 +78,16 @@ class Authenticate
*
* @return mixed
* @throws \Illuminate\Auth\AuthenticationException
* @throws FireflyException
*/
protected function authenticate(array $guards)
{
if (empty($guards)) {
try {
// go for default guard:
if ($this->auth->check()) {
// do an extra check on user object.
$user = $this->auth->authenticate();
if (1 === (int)$user->blocked) {
@@ -95,6 +101,9 @@ class Authenticate
throw new AuthenticationException('Blocked account.', $guards);
}
}
} catch (QueryException $e) {
throw new FireflyException('It seems the database has not yet been initialized. Did you run the correct upgrade or installation commands?');
}
return $this->auth->authenticate();
}