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

@@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Models\Category;
use Input;
/**
* Class CategoryFormRequest
@@ -40,7 +39,6 @@ class CategoryFormRequest extends Request
{
return [
'name' => trim($this->input('name')),
'user' => auth()->user()->id,
];
}
@@ -51,8 +49,8 @@ class CategoryFormRequest extends Request
{
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
if (Category::find(Input::get('id'))) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval(Input::get('id'));
if (Category::find($this->get('id'))) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id'));
}
return [