treewide: fix redirecting to System->Software

By replacing url "admin/system/packages" with "admin/system/opkg"

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
index 4a01bed24798c9cced771199809b4e786ecfd4ba..5bfd3ddcf66ec4ca650b1599b37bba2269aa3cee 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
@@ -98,7 +98,7 @@ else
        o.inputstyle = "apply"
        o.write = function()
                return luci.http.redirect(
-                       luci.dispatcher.build_url("admin/system/packages") ..
+                       luci.dispatcher.build_url("admin/system/opkg") ..
                        "?submit=1&install=iptables-mod-conntrack-extra"
                )
        end

diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
index 5fc20c52bc6931529b939c22664575abc06d0646..54d9618db05a1faa5aad4f6f35d344759a20018e 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
@@ -199,7 +199,7 @@ function option_install_package(s, tab)
 
        function p_install.write()
                return luci.http.redirect(
-                       luci.dispatcher.build_url("admin/system/packages") ..
+                       luci.dispatcher.build_url("admin/system/opkg") ..
                        "?submit=1&install=%s" % opkg_package
                )
        end

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
index acca7cf8a50edc45fbfed13486bf120bb21a5350..777a874340ee4f3a93fbe193bb17dac5ad713eb6 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
@@ -113,7 +113,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null,
                                        var e = document.getElementById(ifc.id + '-ifc-edit');
                                        if (e) e.disabled = true;
 
-                                       var link = L.url('admin/system/packages') + '?query=luci-proto&display=available';
+                                       var link = L.url('admin/system/opkg') + '?query=luci-proto&display=available';
                                        L.dom.content(d, [
                                                E('em', _('Unsupported protocol type.')), E('br'),
                                                E('a', { href: link }, _('Install protocol extensions...'))

diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index bff859befa2337c3ff6a1d6f0ff26a2cac3ee230..05689d389b481f51b7e9c9924a5e738b9f54d3f9 100644 (file)
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
@@ -226,7 +226,7 @@ if not net:is_installed() then
 
        function p_install.write()
                return luci.http.redirect(
-                       luci.dispatcher.build_url("admin/system/packages") ..
+                       luci.dispatcher.build_url("admin/system/opkg") ..
                        "?submit=1&install=%s" % net:opkg_package()
                )
        end