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

Fix #3440

Browse Source
This commit is contained in:
James Cole
2020-06-26 07:28:25 +02:00
parent 8da6ec3f5b
commit 5a03f3395c
7 changed files with 83 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/Rule/IndexController.php
View File

@@ -24,15 +24,14 @@ namespace FireflyIII\Http\Controllers\Rule;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Support\Http\Controllers\RuleManagement;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
/**
@@ -66,20 +65,6 @@ class IndexController extends Controller
);
}
/**
* Move rule down in list.
*
* @param Rule $rule
*
* @return RedirectResponse|Redirector
*/
public function down(Rule $rule)
{
$this->ruleRepos->moveDown($rule);
return redirect(route('rules.index'));
}
/**
* Index of all rules and groups.
*
@@ -135,17 +120,18 @@ class IndexController extends Controller
/**
* Move rule ip.
* @param Request $request
* @param Rule $rule
* @param RuleGroup $ruleGroup
*
* @param Rule $rule
*
* @return RedirectResponse|Redirector
* @return JsonResponse
*/
public function up(Rule $rule)
public function moveRule(Request $request, Rule $rule, RuleGroup $ruleGroup): JsonResponse
{
$this->ruleRepos->moveUp($rule);
$order = (int) $request->get('order');
$this->ruleRepos->moveRule($rule, $ruleGroup, (int) $order);
return redirect(route('rules.index'));
return response()->json([]);
}
}