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

User can now re-order triggers and actions.

Browse Source
This commit is contained in:
James Cole
2016-01-14 11:27:15 +01:00
parent b9b0413510
commit 81b9d5da09
10 changed files with 243 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use Input;
use Preferences;
use Response;
use Session;
use URL;
use View;
@@ -168,11 +169,11 @@ class RuleController extends Controller
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroyRuleGroup(RuleGroup $ruleGroup, RuleRepositoryInterface $repository)
public function destroyRuleGroup(RuleRepositoryInterface $repository, RuleGroup $ruleGroup)
{
$title = $ruleGroup->title;
$moveTo = Auth::user()->ruleGroups()->find(intval(Input::get('move_rules_before_delete')));
$title = $ruleGroup->title;
$moveTo = Auth::user()->ruleGroups()->find(intval(Input::get('move_rules_before_delete')));
$repository->destroyRuleGroup($ruleGroup, $moveTo);
@@ -184,16 +185,61 @@ class RuleController extends Controller
return redirect(Session::get('rules.rule-group.delete.url'));
}
/**
* @param RuleRepositoryInterface $repository
* @param Rule $rule
* @return \Illuminate\Http\JsonResponse
*/
public function reorderRuleTriggers(RuleRepositoryInterface $repository, Rule $rule)
{
$ids = Input::get('triggers');
if (is_array($ids)) {
$repository->reorderRuleTriggers($rule, $ids);
}
return Response::json(true);
}
/**
* @param RuleRepositoryInterface $repository
* @param Rule $rule
* @return \Illuminate\Http\JsonResponse
*/
public function reorderRuleActions(RuleRepositoryInterface $repository, Rule $rule)
{
$ids = Input::get('actions');
if (is_array($ids)) {
$repository->reorderRuleActions($rule, $ids);
}
return Response::json(true);
}
/**
* @return View
*/
public function index()
{
$ruleGroups = Auth::user()->ruleGroups()->orderBy('order','ASC') ->with(['rules' => function ($query) {
$query->orderBy('order', 'ASC');
$ruleGroups = Auth::user()
->ruleGroups()
->orderBy('order', 'ASC')
->with(
[
'rules' => function ($query) {
$query->orderBy('order', 'ASC');
}])->get();
},
'rules.ruleTriggers' => function ($query) {
$query->orderBy('order', 'ASC');
},
'rules.ruleActions' => function ($query) {
$query->orderBy('order', 'ASC');
},
]
)->get();
return view('rules.index', compact('ruleGroups'));
}