Remove a lot of references to user id.

This commit is contained in:
James Cole
2016-10-23 12:19:32 +02:00
parent 9a30fbd05a
commit c39659b064
21 changed files with 33 additions and 60 deletions

View File

@@ -15,7 +15,6 @@ namespace FireflyIII\Http\Requests;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use Input;
/**
* Class AccountFormRequest
@@ -45,7 +44,6 @@ class AccountFormRequest extends Request
'accountType' => $this->input('what'),
'virtualBalance' => round($this->input('virtualBalance'), 2),
'virtualBalanceCurrency' => intval($this->input('amount_currency_id_virtualBalance')),
'user' => auth()->user()->id,
'iban' => trim($this->input('iban')),
'accountNumber' => trim($this->input('accountNumber')),
'accountRole' => $this->input('accountRole'),
@@ -68,9 +66,9 @@ class AccountFormRequest extends Request
$nameRule = 'required|min:1|uniqueAccountForUser';
$idRule = '';
if (Account::find(Input::get('id'))) {
if (Account::find($this->get('id'))) {
$idRule = 'belongsToUser:accounts';
$nameRule = 'required|min:1|uniqueAccountForUser:' . Input::get('id');
$nameRule = 'required|min:1|uniqueAccountForUser:' . $this->get('id');
}
return [