kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

make sure all forms work as expected for b3.

Browse Source
This commit is contained in:
James Cole
2021-03-16 06:42:58 +01:00
parent d5ee87ddee
commit a43bd745d1
8 changed files with 72 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Repositories/Rule/RuleRepository.php
View File

@@ -263,59 +263,16 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function moveRule(Rule $rule, RuleGroup $ruleGroup, int $order): Rule
{
$rule->order = $order;
if ($rule->rule_group_id !== $ruleGroup->id) {
$rule->rule_group_id = $ruleGroup->id;
}
$rule->save();
$rule->refresh();
$this->setOrder($rule, $order);
return $rule;
}
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleActions(Rule $rule, array $ids): bool
{
$order = 1;
foreach ($ids as $actionId) {
/** @var RuleTrigger $trigger */
$action = $rule->ruleActions()->find($actionId);
if (null !== $action) {
$action->order = $order;
$action->save();
++$order;
}
}
return true;
}
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleTriggers(Rule $rule, array $ids): bool
{
$order = 1;
foreach ($ids as $triggerId) {
/** @var RuleTrigger $trigger */
$trigger = $rule->ruleTriggers()->find($triggerId);
if (null !== $trigger) {
$trigger->order = $order;
$trigger->save();
++$order;
}
}
return true;
}
/**
* @param RuleGroup $ruleGroup
*

16
app/Repositories/Rule/RuleRepositoryInterface.php
View File

@@ -132,22 +132,6 @@ interface RuleRepositoryInterface
*/
public function moveRule(Rule $rule, RuleGroup $ruleGroup, int $order): Rule;
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleActions(Rule $rule, array $ids): bool;
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleTriggers(Rule $rule, array $ids): bool;
/**
* @param RuleGroup $ruleGroup
*