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

More tests.

Browse Source
This commit is contained in:
James Cole
2016-12-18 19:34:03 +01:00
parent 5c28adf266
commit 8deb92c3e5
7 changed files with 155 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ use FireflyIII\Models\RuleTrigger;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Rules\TransactionMatcher;
use Illuminate\Http\Request;
use Input;
use Preferences;
use Response;
@@ -87,7 +88,7 @@ class RuleController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (session('rules.rule.create.fromStore') !== true) {
Session::put('rules.rule.create.url', URL::previous());
Session::put('rules.create.url', URL::previous());
}
Session::forget('rules.rule.create.fromStore');
Session::flash('gaEventCategory', 'rules');
@@ -110,7 +111,7 @@ class RuleController extends Controller
$subTitle = trans('firefly.delete_rule', ['title' => $rule->title]);
// put previous url in session
Session::put('rules.rule.delete.url', URL::previous());
Session::put('rules.delete.url', URL::previous());
Session::flash('gaEventCategory', 'rules');
Session::flash('gaEventAction', 'delete-rule');
@@ -135,7 +136,7 @@ class RuleController extends Controller
Preferences::mark();
return redirect(session('rules.rule.delete.url'));
return redirect(session('rules.delete.url'));
}
/**
@@ -179,7 +180,7 @@ class RuleController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (session('rules.rule.edit.fromUpdate') !== true) {
Session::put('rules.rule.edit.url', URL::previous());
Session::put('rules.edit.url', URL::previous());
}
Session::forget('rules.rule.edit.fromUpdate');
Session::flash('gaEventCategory', 'rules');
@@ -203,14 +204,15 @@ class RuleController extends Controller
}
/**
* @param Request $request
* @param RuleRepositoryInterface $repository
* @param Rule $rule
*
* @return \Illuminate\Http\JsonResponse
*/
public function reorderRuleActions(RuleRepositoryInterface $repository, Rule $rule)
public function reorderRuleActions(Request $request, RuleRepositoryInterface $repository, Rule $rule)
{
$ids = Input::get('actions');
$ids = $request->get('actions');
if (is_array($ids)) {
$repository->reorderRuleActions($rule, $ids);
}
@@ -220,14 +222,15 @@ class RuleController extends Controller
}
/**
* @param Request $request
* @param RuleRepositoryInterface $repository
* @param Rule $rule
*
* @return \Illuminate\Http\JsonResponse
*/
public function reorderRuleTriggers(RuleRepositoryInterface $repository, Rule $rule)
public function reorderRuleTriggers(Request $request, RuleRepositoryInterface $repository, Rule $rule)
{
$ids = Input::get('triggers');
$ids = $request->get('triggers');
if (is_array($ids)) {
$repository->reorderRuleTriggers($rule, $ids);
}
@@ -260,7 +263,7 @@ class RuleController extends Controller
}
// redirect to previous URL.
return redirect(session('rules.rule.create.url'));
return redirect(session('rules.create.url'));
}
@@ -347,7 +350,7 @@ class RuleController extends Controller
}
// redirect to previous URL.
return redirect(session('rules.rule.edit.url'));
return redirect(session('rules.edit.url'));
}
private function createDefaultRule()