kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 03:42:54 +00:00
Code Issues Projects Releases Wiki Activity

Some code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-01-28 16:03:49 +01:00
parent 3d69dc786d
commit 287c1c4ffa
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ class RuleController extends Controller
$repository->reorderRuleActions($rule, $ids);
}
return Response::json(true);
return Response::json('true');
}
@@ -231,7 +231,7 @@ class RuleController extends Controller
$repository->reorderRuleTriggers($rule, $ids);
}
return Response::json(true);
return Response::json('true');
}
@@ -446,21 +446,21 @@ class RuleController extends Controller
{
$newIndex = 0;
$actions = [];
if (is_array(Input::old('rule-action'))) {
foreach (Input::old('rule-action') as $index => $entry) {
$count = ($newIndex + 1);
$checked = isset(Input::old('rule-action-stop')[$index]) ? true : false;
$actions[] = view(
'rules.partials.action',
[
'oldTrigger' => $entry,
'oldValue' => Input::old('rule-action-value')[$index],
'oldChecked' => $checked,
'count' => $count,
]
)->render();
$newIndex++;
}
/** @var array $oldActions */
$oldActions = is_array(Input::old('rule-action')) ? Input::old('rule-action') : [];
foreach ($oldActions as $index => $entry) {
$count = ($newIndex + 1);
$checked = isset(Input::old('rule-action-stop')[$index]) ? true : false;
$actions[] = view(
'rules.partials.action',
[
'oldTrigger' => $entry,
'oldValue' => Input::old('rule-action-value')[$index],
'oldChecked' => $checked,
'count' => $count,
]
)->render();
$newIndex++;
}
return $actions;
@@ -473,21 +473,21 @@ class RuleController extends Controller
{
$newIndex = 0;
$triggers = [];
if (is_array(Input::old('rule-trigger'))) {
foreach (Input::old('rule-trigger') as $index => $entry) {
$count = ($newIndex + 1);
$oldChecked = isset(Input::old('rule-trigger-stop')[$index]) ? true : false;
$triggers[] = view(
'rules.partials.trigger',
[
'oldTrigger' => $entry,
'oldValue' => Input::old('rule-trigger-value')[$index],
'oldChecked' => $oldChecked,
'count' => $count,
]
)->render();
$newIndex++;
}
/** @var array $oldTriggers */
$oldTriggers = is_array(Input::old('rule-trigger')) ? Input::old('rule-trigger') : [];
foreach ($oldTriggers as $index => $entry) {
$count = ($newIndex + 1);
$oldChecked = isset(Input::old('rule-trigger-stop')[$index]) ? true : false;
$triggers[] = view(
'rules.partials.trigger',
[
'oldTrigger' => $entry,
'oldValue' => Input::old('rule-trigger-value')[$index],
'oldChecked' => $oldChecked,
'count' => $count,
]
)->render();
$newIndex++;
}
return $triggers;