summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-01-18 16:57:16 +0100
committerSimon Rettberg2019-01-18 16:57:16 +0100
commit313d1c1dfb15de455cc5a8e4952eccfed5fba159 (patch)
treeb0b61c9d25956593a9e7917b1b2a94fcd7c5b950
parent[serversetup-bwlp] Link systemmodel to machine list (diff)
downloadslx-admin-313d1c1dfb15de455cc5a8e4952eccfed5fba159.tar.gz
slx-admin-313d1c1dfb15de455cc5a8e4952eccfed5fba159.tar.xz
slx-admin-313d1c1dfb15de455cc5a8e4952eccfed5fba159.zip
[serversetup-bwlp] Fix saving default; add missing lang tag
-rw-r--r--modules-available/serversetup-bwlp/api.inc.php2
-rw-r--r--modules-available/serversetup-bwlp/lang/de/template-tags.json1
-rw-r--r--modules-available/serversetup-bwlp/page.inc.php3
-rw-r--r--modules-available/serversetup-bwlp/templates/localboot.html2
4 files changed, 5 insertions, 3 deletions
diff --git a/modules-available/serversetup-bwlp/api.inc.php b/modules-available/serversetup-bwlp/api.inc.php
index d089584e..6da4c5df 100644
--- a/modules-available/serversetup-bwlp/api.inc.php
+++ b/modules-available/serversetup-bwlp/api.inc.php
@@ -106,7 +106,7 @@ if ($model !== false) {
}
}
if ($localboot === false || !isset($BOOT_METHODS[$localboot])) {
- $localboot = Property::get('serversetup.localboot', 'AUTO');
+ $localboot = Property::get(Localboot::PROPERTY_KEY, 'AUTO');
if (!isset($BOOT_METHODS[$localboot])) {
$localboot = 'AUTO';
}
diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json
index 2b68b3fb..a242be5e 100644
--- a/modules-available/serversetup-bwlp/lang/de/template-tags.json
+++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json
@@ -72,6 +72,7 @@
"lang_seconds": "Sekunden",
"lang_set": "Setzen",
"lang_spacer": "Abstandhalter\/\u00dcberschrift",
+ "lang_systemmodel": "System-Modell",
"lang_title": "Titel",
"lang_typeExecEntry": "Standardeintrag",
"lang_typeScriptEntry": "Benutzerdefiniertes Script",
diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index 7766050b..6c32cb82 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -245,7 +245,7 @@ class Page_ServerSetup extends Page
private function showLocalbootConfig()
{
// Default setting
- $default = Property::get('serversetup.localboot', false);
+ $default = Property::get(Localboot::PROPERTY_KEY, 'AUTO');
if (!array_key_exists($default, Localboot::BOOT_METHODS)) {
$default = 'AUTO';
}
@@ -796,6 +796,7 @@ class Page_ServerSetup extends Page
Message::addError('localboot-invalid-method', $default);
return;
}
+ Property::set(Localboot::PROPERTY_KEY, $default);
$overrides = Request::post('override', [], 'array');
Database::exec('TRUNCATE TABLE serversetup_localboot');
foreach ($overrides as $model => $mode) {
diff --git a/modules-available/serversetup-bwlp/templates/localboot.html b/modules-available/serversetup-bwlp/templates/localboot.html
index 960f463d..3037de2a 100644
--- a/modules-available/serversetup-bwlp/templates/localboot.html
+++ b/modules-available/serversetup-bwlp/templates/localboot.html
@@ -25,7 +25,7 @@
</h3>
<table class="table">
<tr>
- <th>{{lang_name}}</th>
+ <th>{{lang_systemmodel}}</th>
<th class="slx-smallcol">{{lang_count}}</th>
<th class="slx-smallcol">{{lang_override}}</th>
</tr>