From a28a74500679ddbc04feee79cd6485eac252b090 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Dec 2019 15:58:03 +0100
Subject: [statistics/baseconfig] Redirect to machine details after editing
---
modules-available/baseconfig/page.inc.php | 7 ++++---
modules-available/baseconfig/templates/_page.html | 3 +++
modules-available/statistics/templates/machine-main.html | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index a931d3f3..498fd166 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -86,11 +86,11 @@ class Page_BaseConfig extends Page
}
Message::addSuccess('settings-updated');
if ($this->targetModule === false) {
- Util::redirect('?do=BaseConfig');
+ Util::redirect('?do=BaseConfig', true);
} elseif (empty($this->qry_extra['field'])) {
- Util::redirect('?do=BaseConfig&module=' . $this->targetModule);
+ Util::redirect('?do=BaseConfig&module=' . $this->targetModule, true);
} else {
- Util::redirect('?do=BaseConfig&module=' . $this->targetModule . '&' . $this->qry_extra['field'] . '=' . $this->qry_extra['field_value']);
+ Util::redirect('?do=BaseConfig&module=' . $this->targetModule . '&' . $this->qry_extra['field'] . '=' . $this->qry_extra['field_value'], true);
}
}
// Load categories so we can define them as sub menu items
@@ -189,6 +189,7 @@ class Page_BaseConfig extends Page
'categories' => array_values($settings),
'target_module' => $this->targetModule,
'edit_disabled' => $editForbidden ? 'disabled' : '',
+ 'redirect' => Request::get('redirect'),
) + $this->qry_extra);
}
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html
index 1f9bcafb..ef10ac26 100644
--- a/modules-available/baseconfig/templates/_page.html
+++ b/modules-available/baseconfig/templates/_page.html
@@ -6,6 +6,9 @@
{{lang_clientRelatedConfig}}