diff options
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 15 | ||||
| -rw-r--r-- | modules-available/locationinfo/page.inc.php | 21 | ||||
| -rw-r--r-- | modules-available/locationinfo/templates/server-settings.html | 2 |
3 files changed, 26 insertions, 12 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 1615b8ec..c5bbf76c 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -155,6 +155,7 @@ function getRoomInfo($idList, $coords = false) function getOpeningTime($idList) { $dbresult = array(); + $finalArray = array(); if (!empty($idList)) { // Build SQL Query for multiple ids. @@ -171,14 +172,14 @@ function getOpeningTime($idList) $handledIds[] = $data['id']; $dbresult[] = $data; } - } - $finalArray = array(); - $idList = array_diff($idList, $handledIds); - foreach ($idList as $id) { - $data['id'] = $id; - $data['openingtime'] = array(); - $dbresult[] = $data; + + $idList = array_diff($idList, $handledIds); + foreach ($idList as $id) { + $data['id'] = $id; + $data['openingtime'] = array(); + $dbresult[] = $data; + } } // Go through the db entrys [id] = id; [openingtime] = e.g. [{"days":["Saturday","Sunday"],"openingtime":"12:32","closingtime":"14:35"}] diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index 6867a59f..2969f832 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -547,15 +547,28 @@ class Page_LocationInfo extends Page } } + $selection = array(); + if (is_array($value)) { - $selection = array(); + + $selfirst = true; foreach ($value as $opt) { $option['option'] = $opt; - if ($opt == $credential['value']) { - $option['active'] = true; + if (isset($credential['value'])) { + if ($opt == $credential['value']) { + $option['active'] = true; + } else { + $option['active'] = false; + } } else { - $option['active'] = false; + if ($selfirst) { + $option['active'] = true; + $selfirst = false; + } else { + $option['active'] = false; + } } + $selection[] = $option; } $credential['type'] = "array"; diff --git a/modules-available/locationinfo/templates/server-settings.html b/modules-available/locationinfo/templates/server-settings.html index bd52ded8..bb5b68d3 100644 --- a/modules-available/locationinfo/templates/server-settings.html +++ b/modules-available/locationinfo/templates/server-settings.html @@ -136,7 +136,7 @@ $("#credentials-list").append('<div class="list-group-item"><div class="row">\ <div class="col-md-3"><label>{{name}}</label></div>\ <div class="col-md-7">\ - <select class="form-control" id="input-{{uid}}" name="{{uid}}" form="settingsForm">\ + <select class="form-control" id="input-selection-{{uid}}" name="{{uid}}" form="settingsForm">\ {{#array}}\ <option value="{{option}}" {{#active}}selected{{/active}}>{{option}}</option>\ {{/array}}\ |