From 5947d5faff03e409e33af1e5578f9a0121e87e49 Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Tue, 27 Mar 2018 09:46:16 +0200
Subject: [usb-lock-off] Added successfully edit message and a redirect to the
configuration
---
modules-available/usblockoff/lang/de/messages.json | 1 +
modules-available/usblockoff/lang/de/template-tags.json | 3 ++-
modules-available/usblockoff/lang/en/messages.json | 1 +
modules-available/usblockoff/lang/en/template-tags.json | 3 ++-
modules-available/usblockoff/page.inc.php | 5 +++++
modules-available/usblockoff/templates/usb-edit-rule.html | 2 +-
6 files changed, 12 insertions(+), 3 deletions(-)
(limited to 'modules-available')
diff --git a/modules-available/usblockoff/lang/de/messages.json b/modules-available/usblockoff/lang/de/messages.json
index ae926304..319569fe 100644
--- a/modules-available/usblockoff/lang/de/messages.json
+++ b/modules-available/usblockoff/lang/de/messages.json
@@ -1,6 +1,7 @@
{
"config-deleted": "Konfiguration erfolgreich gelöscht.",
"config-saved": "Konfiguration erfolgreich gespeichert.",
+ "rule-edited": "Regel erfolgreich geändert.",
"rule-deleted": "Regel erfolgreich gelöscht.",
"invalid-rule-id": "Ungültige Regel ID."
}
\ No newline at end of file
diff --git a/modules-available/usblockoff/lang/de/template-tags.json b/modules-available/usblockoff/lang/de/template-tags.json
index 4e623e3a..e37d7155 100644
--- a/modules-available/usblockoff/lang/de/template-tags.json
+++ b/modules-available/usblockoff/lang/de/template-tags.json
@@ -55,5 +55,6 @@
"lang_editConfig": "Konfiguration bearbeiten",
"lang_configDesc_helptext": "Beschreibung der Konfiguration.",
"lang_attributes": "Attribute",
- "lang_action": "Aktion"
+ "lang_action": "Aktion",
+ "lang_editRule": "Regel bearbeiten"
}
diff --git a/modules-available/usblockoff/lang/en/messages.json b/modules-available/usblockoff/lang/en/messages.json
index 6873e284..70627a36 100644
--- a/modules-available/usblockoff/lang/en/messages.json
+++ b/modules-available/usblockoff/lang/en/messages.json
@@ -1,6 +1,7 @@
{
"config-deleted": "Configuration successfully deleted.",
"config-saved": "Configuration successfully saved.",
+ "rule-edited": "Rule successfully edited.",
"rule-deleted": "Rule successfully deleted.",
"invalid-rule-id": "Invalid rule ID."
}
\ No newline at end of file
diff --git a/modules-available/usblockoff/lang/en/template-tags.json b/modules-available/usblockoff/lang/en/template-tags.json
index 1ddb6334..fd9fb045 100644
--- a/modules-available/usblockoff/lang/en/template-tags.json
+++ b/modules-available/usblockoff/lang/en/template-tags.json
@@ -55,5 +55,6 @@
"lang_editConfig": "Edit Configuration",
"lang_configDesc_helptext": "Description of the configuration.",
"lang_attributes": "Attributes",
- "lang_action": "Action"
+ "lang_action": "Action",
+ "lang_editRule": "Edit rule"
}
diff --git a/modules-available/usblockoff/page.inc.php b/modules-available/usblockoff/page.inc.php
index e978eec2..e2ebf11c 100644
--- a/modules-available/usblockoff/page.inc.php
+++ b/modules-available/usblockoff/page.inc.php
@@ -70,6 +70,8 @@ class Page_usblockoff extends Page
private function editRule() {
$ruleid = Request::post('ruleid', 0, 'int');
+ $configid = Request::post('configid', 0, 'int');
+
$attributes = json_decode(Request::post('attributes', '', 'string'), true);
if ($ruleid != 0) {
@@ -97,6 +99,9 @@ class Page_usblockoff extends Page
'val' => $value
));
}
+
+ Message::addSuccess('rule-edited');
+ Util::redirect('?do=usblockoff&show=edit-config&configid=' . $configid);
}
private function addDevices()
diff --git a/modules-available/usblockoff/templates/usb-edit-rule.html b/modules-available/usblockoff/templates/usb-edit-rule.html
index 296d3bf7..55cdce0d 100644
--- a/modules-available/usblockoff/templates/usb-edit-rule.html
+++ b/modules-available/usblockoff/templates/usb-edit-rule.html
@@ -6,7 +6,7 @@
-
{{lang_editRules}}
+
{{lang_editRule}}