Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

keeping filter and pagination when saving OrderJournal

Browse Source
This commit is contained in:
Frank Schubert
2021-11-02 21:47:02 +01:00
parent 42f4da3799
commit 5a132add9b
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/OrderJournal/OrderJournalController.php
View File

@@ -22,6 +22,8 @@ class OrderJournalController extends mfBaseController {
$r = $this->request;
$order_id = $r->order_id;
$s = $r->s;
if(!is_numeric($order_id) || $order_id < 1) {
$this->layout()->setFlash("Bestellung nicht gefunden!", "error");
$this->redirect("Order");
@@ -36,10 +38,19 @@ class OrderJournalController extends mfBaseController {
$text = trim(htmlentities($r->text));
if(!$text) {
$this->layout()->setFlash("Bitte Text eingeben", "error");
$this->redirect("Order", "Index", [], "order=".$order_id);
$this->redirect("Order", "Index", ['s' => $s], "order=".$order_id);
}
$query = [];
if(is_numeric($this->request->s) && $this->request->s > 0) {
$query["s"] = $this->request->s;
}
if (is_array($this->request->filter)) {
$query["filter"] = $this->request->filter;
}
$qs = http_build_query($query);
$journal = new OrderJournal();
$journal->order_id = $order_id;
@@ -49,11 +60,13 @@ class OrderJournalController extends mfBaseController {
if(!$journal->save()) {
$this->layout()->setFlash("Fehler beim speichern!", "error");
$this->redirect("Order", "Index", [], "order=".$order_id);
$this->redirect("Order", "Index", $qs, "order=".$order_id);
}
$this->layout()->setFlash("Journaleintrag gespeichert", "success");
$this->redirect("Order", "Index", [], "order=".$order_id);
$this->redirect("Order", "Index", $qs, "order=".$order_id);
}