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

Some code cleanup things courtesy of SensioLabs.

Browse Source
This commit is contained in:
James Cole
2016-01-28 21:33:45 +01:00
parent 167c057e8a
commit e5b4a55d8e
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/RuleController.php
View File

@@ -17,6 +17,7 @@ use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Input;
use Preferences;
use Response;
@@ -177,22 +178,21 @@ class RuleController extends Controller
$this->createDefaultRuleGroup();
$this->createDefaultRule();
$ruleGroups = Auth::user()
->ruleGroups()
->orderBy('active', 'DESC')
->orderBy('order', 'ASC')
->with(
[
'rules' => function ($query) {
'rules' => function (HasMany $query) {
$query->orderBy('active', 'DESC');
$query->orderBy('order', 'ASC');
},
'rules.ruleTriggers' => function ($query) {
'rules.ruleTriggers' => function (HasMany $query) {
$query->orderBy('order', 'ASC');
},
'rules.ruleActions' => function ($query) {
'rules.ruleActions' => function (HasMany $query) {
$query->orderBy('order', 'ASC');
},
]