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

No use models directly.

Browse Source
This commit is contained in:
James Cole
2016-10-23 12:41:54 +02:00
parent a79a8c8874
commit 6a2f8fa9ee
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/RuleFormRequest.php
View File

@@ -13,7 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
/**
* Class RuleFormRequest
@@ -57,7 +57,8 @@ class RuleFormRequest extends Request
*/
public function rules()
{
/** @var RuleGroupRepositoryInterface $repository */
$repository = app(RuleGroupRepositoryInterface::class);
$validTriggers = array_keys(config('firefly.rule-triggers'));
$validActions = array_keys(config('firefly.rule-actions'));
@@ -65,7 +66,7 @@ class RuleFormRequest extends Request
$contextActions = join(',', config('firefly.rule-actions-text'));
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
if (RuleGroup::find($this->get('id'))) {
if (!is_null($repository->find(intval($this->get('id')))->id)) {
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id'));
}