Merge pull request #2409 from yousong/install-packages

treewide: fix redirecting to System->Software

applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua

@@ -98,8 +98,8 @@ else
 	o.inputstyle = "apply"
 	o.write = function()
 		return luci.http.redirect(
-			luci.dispatcher.build_url("admin/system/packages") ..
-			"?submit=1&install=iptables-mod-conntrack-extra"
+			luci.dispatcher.build_url("admin/system/opkg") ..
+			"?query=iptables-mod-conntrack-extra"
 		)
 	end
 end

applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua

@@ -199,8 +199,8 @@ function option_install_package(s, tab)
 
 	function p_install.write()
 		return luci.http.redirect(
-			luci.dispatcher.build_url("admin/system/packages") ..
-			"?submit=1&install=%s" % opkg_package
+			luci.dispatcher.build_url("admin/system/opkg") ..
+			"?query=%s" % opkg_package
 		)
 	end
 end

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';
 					L.dom.content(d, [
 						E('em', _('Unsupported protocol type.')), E('br'),
 						E('a', { href: link }, _('Install protocol extensions...'))

modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua

@@ -226,8 +226,8 @@ if not net:is_installed() then
 
 	function p_install.write()
 		return luci.http.redirect(
-			luci.dispatcher.build_url("admin/system/packages") ..
-			"?submit=1&install=%s" % net:opkg_package()
+			luci.dispatcher.build_url("admin/system/opkg") ..
+			"?query=%s" % net:opkg_package()
 		)
 	end
 end