Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4474 from dibdot/trm-fix

Browse source 
luci-app-travelmate: sync with travelmate 2.0.1
This commit is contained in:
Dirk Brenken 2020-09-27 14:38:10 +02:00 committed by GitHub
commit 9d180607d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js
View file

@ -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();
}

4
applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
View file

@ -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" ],