diff options
| author | Simon Rettberg | 2019-12-13 15:58:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-12-13 15:58:03 +0100 |
| commit | a28a74500679ddbc04feee79cd6485eac252b090 (patch) | |
| tree | 12124811b1d520ad7130824b719e42a450ba9981 /modules-available | |
| parent | [inc/Render] Add qstr_urlencode as global mustache var (diff) | |
| download | slx-admin-a28a74500679ddbc04feee79cd6485eac252b090.tar.gz slx-admin-a28a74500679ddbc04feee79cd6485eac252b090.tar.xz slx-admin-a28a74500679ddbc04feee79cd6485eac252b090.zip | |
[statistics/baseconfig] Redirect to machine details after editing
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/baseconfig/page.inc.php | 7 | ||||
| -rw-r--r-- | modules-available/baseconfig/templates/_page.html | 3 | ||||
| -rw-r--r-- | 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 @@ <p>{{lang_clientRelatedConfig}}</p> <form action="?do=BaseConfig" method="post"> <input type="hidden" name="token" value="{{token}}"> + {{#redirect}} + <input type="hidden" name="redirect" value="{{redirect}}"> + {{/redirect}} {{#override}} <input name="module" type="hidden" value="{{target_module}}"> <input name="{{field}}" type="hidden" value="{{field_value}}"> diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 8c5668f2..d0e6b3c1 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -182,7 +182,7 @@ {{lang_configVars}} </td> <td> - <a class="btn btn-sm btn-default" href="?do=baseconfig&module=statistics&machineuuid={{machineuuid}}"> + <a class="btn btn-sm btn-default" href="?do=baseconfig&module=statistics&machineuuid={{machineuuid}}&redirect={{qstr_urlencode}}"> <span class="glyphicon glyphicon-edit"></span> {{lang_edit}} ({{overriddenVars}}) </a> |