diff options
| author | Simon Rettberg | 2017-12-19 12:35:22 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-19 12:35:22 +0100 |
| commit | cf9cf089478d5713e83339e02d4164efaa30ed28 (patch) | |
| tree | 7c869df19c48567b698ec8d655de3dc92fcb8ad2 /modules-available/locationinfo | |
| parent | [locationinfo] Reload panels when opening times are changed (diff) | |
| download | slx-admin-cf9cf089478d5713e83339e02d4164efaa30ed28.tar.gz slx-admin-cf9cf089478d5713e83339e02d4164efaa30ed28.tar.xz slx-admin-cf9cf089478d5713e83339e02d4164efaa30ed28.zip | |
[locationinfo] Fix infinite reload loop
Diffstat (limited to 'modules-available/locationinfo')
| -rw-r--r-- | modules-available/locationinfo/inc/infopanel.inc.php | 3 | ||||
| -rw-r--r-- | modules-available/locationinfo/templates/frontend-summary.html | 32 |
2 files changed, 30 insertions, 5 deletions
diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php index 12b6aec7..edeb9ccf 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -12,7 +12,7 @@ class InfoPanel */ public static function getConfig($paneluuid, &$config) { - $panel = Database::queryFirst('SELECT panelname, panelconfig, paneltype, locationids, lastchange FROM locationinfo_panel WHERE paneluuid = :paneluuid', + $panel = Database::queryFirst('SELECT panelname, panelconfig, paneltype, locationids FROM locationinfo_panel WHERE paneluuid = :paneluuid', compact('paneluuid')); if ($panel === false) { @@ -68,7 +68,6 @@ class InfoPanel } self::appendOpeningTimes($config['locations'], $lids); - $config['ts'] = (int)$panel['lastchange']; $config['locations'] = array_values($config['locations']); $config['time'] = date('Y-n-j-G-') . (int)date('i') . '-' . (int)(date('s')); diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html index ec5d8aab..4105dd16 100644 --- a/modules-available/locationinfo/templates/frontend-summary.html +++ b/modules-available/locationinfo/templates/frontend-summary.html @@ -226,8 +226,8 @@ queryRooms(); nextUpdate = 1000; } - for (property in rooms) { - upDateRoomState(rooms[property]); + if (nextUpdate !== 1000) { + queryPanelChange(); } clearTimeout(timeout); setTimeout(update, nextUpdate); @@ -267,7 +267,9 @@ } ComputeCurrentState(rooms[json[i].id]); } - update(); + for (property in rooms) { + upDateRoomState(rooms[property]); + } } /** @@ -765,6 +767,30 @@ }); } + /** + * Checks whether the panel has been edited and reloads + * the entire page if so. + */ + function queryPanelChange() { + $.ajax({ + url: "{{dirprefix}}api.php?do=locationinfo&get=timestamp&uuid={{uuid}}", + dataType: 'json', + cache: false, + timeout: 5000, + success: function (result) { + if (!result || !result.ts) { + console.log('Warning: get=timestamp didnt return json with ts field'); + return; + } + if (config.ts && config.ts !== result.ts) { + // Change + window.location.reload(true); + } + config.ts = result.ts; + } + }) + } + </script> </head> <body> |