diff options
| author | Dirk Brenken <dev@brenken.org> | 2020-09-27 14:38:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 14:38:10 +0200 |
| commit | 9d180607d302c26a0ce86fc6932f4b08efbfb61f (patch) | |
| tree | dc226a5e845270063bd3601edab7b753553d6e05 | |
| parent | 1da9df837685b3a2afc80125d056e37198933533 (diff) | |
| parent | 2815fed05e0232016d7b00bd206f1bf915063619 (diff) | |
Merge pull request #4474 from dibdot/trm-fix
luci-app-travelmate: sync with travelmate 2.0.1
| -rw-r--r-- | applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js | 6 | ||||
| -rw-r--r-- | applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js index 42a1e9aa8..8b3b7d399 100644 --- a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js +++ b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js @@ -104,10 +104,10 @@ function handleSectionsVal(action, section_id, option, value) { */ function handleStatus() { poll.add(function() { - L.resolveDefault(fs.stat('/var/run/travelmate.refresh'), null).then(function(res) { + L.resolveDefault(fs.stat('/var/state/travelmate.refresh'), null).then(function(res) { if (res) { - L.resolveDefault(fs.read_direct('/var/run/travelmate.refresh'), null).then(function(res) { - fs.remove('/var/run/travelmate.refresh'); + L.resolveDefault(fs.read_direct('/var/state/travelmate.refresh'), null).then(function(res) { + fs.remove('/var/state/travelmate.refresh'); if (res && res === 'ui_reload') { location.reload(); } diff --git a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json index f3861e0fb..0fecc9a48 100644 --- a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json +++ b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json @@ -3,7 +3,7 @@ "description": "Grant access to LuCI app travelmate", "write": { "file": { - "/var/run/travelmate.refresh": [ "write" ] + "/var/state/travelmate.refresh": [ "write" ] }, "uci": [ "travelmate" ] }, @@ -12,7 +12,7 @@ "file": { "/etc/travelmate/*.login": [ "list" ], "/var/run/travelmate.pid": [ "read" ], - "/var/run/travelmate.refresh": [ "read" ], + "/var/state/travelmate.refresh": [ "read" ], "/tmp/trm_runtime.json": [ "read" ], "/sbin/logread -e trm-": [ "exec" ], "/usr/sbin/logread -e trm-": [ "exec" ], |