From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Sat, 29 Dec 2018 14:10:10 +0000 (+0000)
Subject: treewide: fix redirecting to System->Software
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85b67625f74031186b9ffa26c966082275796868;p=project%2Fluci.git

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 4a01bed247..5bfd3ddcf6 100644
--- 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 5fc20c52bc..54d9618db0 100644
--- 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 acca7cf8a5..777a874340 100644
--- 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 bff859befa..05689d389b 100644
--- 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