diff options
| author | Jannik Schönartz | 2017-03-24 17:24:16 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-03-24 17:24:16 +0100 |
| commit | 5a19bb3f994acfb0d4a5a7e87c5eb3b94f540151 (patch) | |
| tree | ba03ad36bd381bd67aeaeca2f88c3d54853429d6 | |
| parent | fronted: added JSDoc for doorsign.html (diff) | |
| download | slx-admin-5a19bb3f994acfb0d4a5a7e87c5eb3b94f540151.tar.gz slx-admin-5a19bb3f994acfb0d4a5a7e87c5eb3b94f540151.tar.xz slx-admin-5a19bb3f994acfb0d4a5a7e87c5eb3b94f540151.zip | |
Added a no Server option in the room config
4 files changed, 4 insertions, 1 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 55f21e55..1615b8ec 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -420,7 +420,7 @@ function getCalendar($idList) $serverList = array(); if (!empty($idList)) { - //// Build SQL query for multiple ids. + // Build SQL query for multiple ids. $query = "SELECT locationid, l.serverid AS serverid, serverurl, servertype, credentials FROM `location_info` AS l LEFT JOIN setting_location_info AS s ON s.serverid = l.serverid WHERE locationid IN ("; $query .= implode(",", $idList); diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index 1a7bb537..3197f333 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -72,6 +72,7 @@ "lang_deleteConfirmation": "Bist du sicher?", "lang_addServer": "Server", "lang_addServer_title": "Server hinzufügen", + "lang_noServer": "<Kein Server>", "lang_serverTable": "Server Liste", "lang_buildingTable": "Gebäude / Raum Liste", "lang_serverUrl": "URL", diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index 50cc2b10..8e0b2c8d 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -77,6 +77,7 @@ "lang_deleteConfirmation": "Are you sure?", "lang_addServer": "Server", "lang_addServer_title": "Add server", + "lang_noServer": "<no server>", "lang_serverTable": "Server List", "lang_buildingTable": "Building / Room List", "lang_serverUrl": "URL", diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html index 48a79585..cf5cd3fd 100644 --- a/modules-available/locationinfo/templates/config.html +++ b/modules-available/locationinfo/templates/config.html @@ -16,6 +16,7 @@ </div> <div class="col-md-7"> <select class="form-control" name="serverid"> + <option id="serverOption-{{sid}}" value="0">{{lang_noServer}}</option> {{#serverlist}} <option id="serverOption-{{sid}}" value="{{sid}}">{{sname}}</option> {{/serverlist}} |