diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index d3c64d1d82..4f90ca2bbc 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -166,10 +166,13 @@ class RuleController extends Controller */ public function edit(Request $request, RuleRepositoryInterface $repository, Rule $rule) { - $oldTriggers = $this->getCurrentTriggers($rule); - $triggerCount = count($oldTriggers); - $oldActions = $this->getCurrentActions($rule); - $actionCount = count($oldActions); + /** @var RuleGroupRepositoryInterface $ruleGroupRepository */ + $ruleGroupRepository = app(RuleGroupRepositoryInterface::class); + $oldTriggers = $this->getCurrentTriggers($rule); + $triggerCount = count($oldTriggers); + $oldActions = $this->getCurrentActions($rule); + $actionCount = count($oldActions); + $ruleGroups = ExpandedForm::makeSelectList($ruleGroupRepository->get()); // has old input? if ($request->old()) { @@ -191,7 +194,8 @@ class RuleController extends Controller Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'edit-rule'); - return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount')); + return view('rules.rule.edit', compact('rule', 'subTitle', + 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount','ruleGroups')); } /** diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 3128100e4a..d2a965ca6d 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -39,6 +39,7 @@ class RuleFormRequest extends Request { return [ 'title' => $this->string('title'), + 'rule_group_id' => $this->integer('rule_group_id'), 'active' => $this->boolean('active'), 'trigger' => $this->string('trigger'), 'description' => $this->string('description'), diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 4d655484a7..98d922fa9d 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -316,6 +316,7 @@ class RuleRepository implements RuleRepositoryInterface public function update(Rule $rule, array $data): Rule { // update rule: + $rule->rule_group_id = $data['rule_group_id']; $rule->active = $data['active']; $rule->stop_processing = $data['stop_processing']; $rule->title = $data['title']; diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig index 862fe6849a..dbc112d439 100644 --- a/resources/views/rules/rule/edit.twig +++ b/resources/views/rules/rule/edit.twig @@ -6,7 +6,6 @@ {% block content %} {{ Form.model(rule, {'class' : 'form-horizontal','id' : 'store','url' : route('rules.update', rule.id)}) }} -
@@ -16,6 +15,7 @@
{{ ExpandedForm.text('title') }} + {{ ExpandedForm.select('rule_group_id', ruleGroups) }} {{ ExpandedForm.select('trigger',allJournalTriggers(), primaryTrigger) }} {{ ExpandedForm.checkbox('active',1,rule.active, {helpText: trans('firefly.rule_help_active')}) }} {{ ExpandedForm.checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }}