kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Update requests.

Browse Source
This commit is contained in:
James Cole
2018-08-07 19:24:07 +02:00
parent cd2a251f22
commit 201bc7db53
9 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Requests/CategoryFormRequest.php
View File

@@ -22,7 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Models\Category;
/**
* Class CategoryFormRequest.
@@ -59,11 +59,12 @@ class CategoryFormRequest extends Request
*/
public function rules(): array
{
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
if (null !== $repository->findNull($this->integer('id'))) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . $this->integer('id');
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
/** @var Category $category */
$category = $this->route()->parameter('category');
if (null !== $category) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . $category->id;
}
// fixed