Merge branch 'develop' into 5.8-dev

And fix rule creation and edit etc
This commit is contained in:
James Cole
2022-10-01 07:34:30 +02:00
10 changed files with 35 additions and 18 deletions

View File

@@ -261,6 +261,7 @@ class CreateController extends Controller
public function store(RuleFormRequest $request)
{
$data = $request->getRuleData();
$rule = $this->ruleRepos->store($data);
session()->flash('success', (string) trans('firefly.stored_new_rule', ['title' => $rule->title]));
app('preferences')->mark();

View File

@@ -189,7 +189,8 @@ class EditController extends Controller
public function update(RuleFormRequest $request, Rule $rule)
{
$data = $request->getRuleData();
$this->ruleRepos->update($rule, $data);
//$this->ruleRepos->update($rule, $data);
session()->flash('success', (string) trans('firefly.updated_rule', ['title' => $rule->title]));
app('preferences')->mark();