diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua index e480dacc5..42ddc0ac8 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua @@ -131,7 +131,7 @@ o:value("ipv6_only", translate("IPv6 Only")) o = s:option(Button, "_stop", translate("Delete All Subscribe Node")) o.inputstyle = "remove" function o.write(e, e) - luci.sys.call("lua /usr/share/" .. appname .. "/subscribe.lua truncate all-node > /dev/null 2>&1") + luci.sys.call("lua /usr/share/" .. appname .. "/subscribe.lua truncate > /dev/null 2>&1") m.no_commit = true end diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua index e9767fe94..a3f2cabc5 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua +++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua @@ -1318,13 +1318,11 @@ local function truncate_nodes(add_from) end end end) - if add_from then - uci:foreach(appname, "subscribe_list", function(o) - if add_from == "all-node" or add_from == o.remark then - uci:delete(appname, o['.name'], "md5") - end - end) - end + uci:foreach(appname, "subscribe_list", function(o) + if (not add_from) or add_from == o.remark then + uci:delete(appname, o['.name'], "md5") + end + end) api.uci_save(uci, appname, true) end