Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-31 06:40:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: Fix error on call L.hasSystemFeature('apk')

Browse Source
This commit is contained in:
remittor
2026-01-28 08:26:27 +03:00
parent cd21487f7d
commit 6c9587af06
4 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
View File

@@ -40,7 +40,12 @@ return baseclass.extend({
env_tools.load_env(this);
//console.log('appName: ' + this.appName);
//console.log('PACKAGER: ' + this.packager.name);
},
},
load_feat_env: function()
{
env_tools.load_feat_env(this);
},
infoLabelRunning : '<span class="label-status running">' + _('Running') + '</span>',
infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -189,19 +194,20 @@ return baseclass.extend({
}
},
baseLoad: function(callback, cbarg)
baseLoad: function(ctx, callback)
{
return Promise.all([
L.probeSystemFeatures(),
this.getSvcInfo(), // svc_info
uci.load(this.appName),
])
.then( ([svcInfo, uci_data]) => {
.then( ([ sys_feat, svcInfo, uci_data ]) => {
let svc_info = this.decodeSvcInfo(svcInfo);
let ret = { svc_info, uci_data };
if (typeof callback === 'function') {
const res = callback(cbarg, ret);
if (res && typeof res.then === 'function') {
return res.then(() => ret);
let ret = { sys_feat, svc_info, uci_data };
if (typeof(callback) === 'function') {
const res = callback.call(ctx, ret);
if (res && typeof(res.then) === 'function') {
return res.then(() => res);
}
return ret;
}