zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-nikki: sync upstream

Browse Source 
last commit: 4bc36f86a4
This commit is contained in:
gitea-action 2025-03-18 00:00:43 +08:00
parent ea8a50c055
commit faaa600264
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-nikki/Makefile
View File

@ -1,6 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.21.0 PKG_VERSION:=1.21.1
LUCI_TITLE:=LuCI Support for nikki LUCI_TITLE:=LuCI Support for nikki
LUCI_DEPENDS:=+luci-base +nikki LUCI_DEPENDS:=+luci-base +nikki

12
luci-app-nikki/htdocs/luci-static/resources/tools/nikki.js
View File

@ -105,8 +105,9 @@ return baseclass.extend({
}, },
api: async function (method, path, query, body) { api: async function (method, path, query, body) {
const apiListen = uci.get('nikki', 'mixin', 'api_listen'); const profile = await callNikkiProfile();
const apiSecret = uci.get('nikki', 'mixin', 'api_secret') ?? ''; const apiListen = profile['external-controller'];
const apiSecret = profile['secret'] ?? '';
const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1); const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1);
const url = `http://${window.location.hostname}:${apiPort}${path}`; const url = `http://${window.location.hostname}:${apiPort}${path}`;
return request.request(url, { return request.request(url, {
@ -118,9 +119,10 @@ return baseclass.extend({
}, },
openDashboard: async function () { openDashboard: async function () {
const uiName = uci.get('nikki', 'mixin', 'ui_name'); const profile = await callNikkiProfile();
const apiListen = uci.get('nikki', 'mixin', 'api_listen'); const uiName = profile['external-ui-name'];
const apiSecret = uci.get('nikki', 'mixin', 'api_secret') ?? ''; const apiListen = profile['external-controller'];
const apiSecret = profile['secret'] ?? '';
const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1); const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1);
const params = { const params = {
host: window.location.hostname, host: window.location.hostname,

2
luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
View File

@ -125,7 +125,7 @@ return view.extend({
o = s.taboption('external_control', form.Value, 'api_secret', _('API Secret')); o = s.taboption('external_control', form.Value, 'api_secret', _('API Secret'));
o.password = true; o.password = true;
o.rmempty = false; o.placeholder = _('Unmodified');
o = s.taboption('external_control', form.ListValue, 'selection_cache', _('Save Proxy Selection')); o = s.taboption('external_control', form.ListValue, 'selection_cache', _('Save Proxy Selection'));
o.optional = true; o.optional = true;