summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2020-02-27 13:56:51 +0100
committerSimon Rettberg2020-02-27 13:56:51 +0100
commitc8053a5350e7ace8bfe3007a99e73fd7f36becbb (patch)
tree22e573273afd0b904dbe6c4830b9a45c68ab1a9a
parent[baseconfig] Allow disabling override for shadowed fields (diff)
downloadslx-admin-c8053a5350e7ace8bfe3007a99e73fd7f36becbb.tar.gz
slx-admin-c8053a5350e7ace8bfe3007a99e73fd7f36becbb.tar.xz
slx-admin-c8053a5350e7ace8bfe3007a99e73fd7f36becbb.zip
[rebootcontrol] Add "delete subnet" button
-rw-r--r--modules-available/rebootcontrol/lang/de/messages.json1
-rw-r--r--modules-available/rebootcontrol/lang/de/template-tags.json1
-rw-r--r--modules-available/rebootcontrol/lang/en/messages.json1
-rw-r--r--modules-available/rebootcontrol/lang/en/template-tags.json1
-rw-r--r--modules-available/rebootcontrol/pages/subnet.inc.php15
-rw-r--r--modules-available/rebootcontrol/templates/subnet-edit.html6
6 files changed, 25 insertions, 0 deletions
diff --git a/modules-available/rebootcontrol/lang/de/messages.json b/modules-available/rebootcontrol/lang/de/messages.json
index 7914f37d..b481d64a 100644
--- a/modules-available/rebootcontrol/lang/de/messages.json
+++ b/modules-available/rebootcontrol/lang/de/messages.json
@@ -11,6 +11,7 @@
"some-machine-not-found": "Einige Clients aus dem POST request wurden nicht gefunden",
"subnet-already-exists": "Subnetz existiert bereits",
"subnet-created": "Subnetz angelegt",
+ "subnet-deleted": "Subnetz gel\u00f6scht",
"subnet-updated": "Subnetz aktualisiert",
"unknown-exec-job": "Unbekannte Job-ID: {{0}}",
"unknown-task-type": "Unbekannter Task-Typ",
diff --git a/modules-available/rebootcontrol/lang/de/template-tags.json b/modules-available/rebootcontrol/lang/de/template-tags.json
index dd1c12b5..9ac98035 100644
--- a/modules-available/rebootcontrol/lang/de/template-tags.json
+++ b/modules-available/rebootcontrol/lang/de/template-tags.json
@@ -11,6 +11,7 @@
"lang_checkingJumpHost": "Teste Sprung-Host",
"lang_client": "Client",
"lang_clientCount": "# Clients",
+ "lang_confirmDeleteSubnet": "Dieses Subnetz wirklich l\u00f6schen?",
"lang_connecting": "Verbinde...",
"lang_editJumpHost": "Sprung-Host bearbeiten",
"lang_editSubnet": "Subnetz bearbeiten",
diff --git a/modules-available/rebootcontrol/lang/en/messages.json b/modules-available/rebootcontrol/lang/en/messages.json
index 5b482fab..f125e944 100644
--- a/modules-available/rebootcontrol/lang/en/messages.json
+++ b/modules-available/rebootcontrol/lang/en/messages.json
@@ -11,6 +11,7 @@
"some-machine-not-found": "Some machines from your POST request don't exist",
"subnet-already-exists": "Subnet already exists",
"subnet-created": "Created subnet",
+ "subnet-deleted": "Deleted subnet",
"subnet-updated": "Updated subnet",
"unknown-exec-job": "Invalid job ID: {{0}}",
"unknown-task-type": "Invalid task type",
diff --git a/modules-available/rebootcontrol/lang/en/template-tags.json b/modules-available/rebootcontrol/lang/en/template-tags.json
index c8922d2c..2200a4f6 100644
--- a/modules-available/rebootcontrol/lang/en/template-tags.json
+++ b/modules-available/rebootcontrol/lang/en/template-tags.json
@@ -11,6 +11,7 @@
"lang_checkingJumpHost": "Check jump host",
"lang_client": "Client",
"lang_clientCount": "# clients",
+ "lang_confirmDeleteSubnet": "Delete this subnet?",
"lang_connecting": "Connecting...",
"lang_editJumpHost": "Edit jump host",
"lang_editSubnet": "Edit subnet",
diff --git a/modules-available/rebootcontrol/pages/subnet.inc.php b/modules-available/rebootcontrol/pages/subnet.inc.php
index 04f92efa..cbd5d8f2 100644
--- a/modules-available/rebootcontrol/pages/subnet.inc.php
+++ b/modules-available/rebootcontrol/pages/subnet.inc.php
@@ -10,6 +10,8 @@ class SubPage
self::addSubnet();
} elseif ($action === 'edit') {
self::editSubnet();
+ } elseif ($action === 'delete') {
+ self::deleteSubnet();
}
}
@@ -73,6 +75,19 @@ class SubPage
Message::addSuccess('subnet-updated');
}
+ private static function deleteSubnet()
+ {
+ User::assertPermission('subnet.edit');
+ User::assertPermission('subnet.flag');
+ $id = Request::post('id', Request::REQUIRED, 'int');
+ $num = Database::exec('DELETE FROM reboot_subnet WHERE subnetid = :id', ['id' => $id]);
+ if ($num < 1) {
+ Message::addError('invalid-subnet', $id);
+ return;
+ }
+ Message::addSuccess('subnet-deleted');
+ }
+
/*
* Render
*/
diff --git a/modules-available/rebootcontrol/templates/subnet-edit.html b/modules-available/rebootcontrol/templates/subnet-edit.html
index d8173863..5a6adf3c 100644
--- a/modules-available/rebootcontrol/templates/subnet-edit.html
+++ b/modules-available/rebootcontrol/templates/subnet-edit.html
@@ -47,6 +47,12 @@
</div>
</div>
<div class="panel-footer text-right">
+ <button type="submit" class="btn btn-danger" name="action" value="delete"
+ data-confirm="{{lang_confirmDeleteSubnet}}"
+ {{perms.subnet.edit.disabled}} {{perms.subnet.flag.disabled}}>
+ <span class="glyphicon glyphicon-trash"></span>
+ {{lang_delete}}
+ </button>
<button type="submit" class="btn btn-primary" name="action" value="edit" {{perms.subnet.flag.disabled}}>
<span class="glyphicon glyphicon-floppy-disk"></span>
{{lang_save}}