treewide: fix query arguments to admin/system/opkg

Right now the handler only recognizes "query=xx" argument, others will
be ignored.

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 5bfd3ddcf66ec4ca650b1599b37bba2269aa3cee..553b297ac0d5aa280f81248438aed03485c6abff 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
@@ -99,7 +99,7 @@ else
        o.write = function()
                return luci.http.redirect(
                        luci.dispatcher.build_url("admin/system/opkg") ..
-                       "?submit=1&install=iptables-mod-conntrack-extra"
+                       "?query=iptables-mod-conntrack-extra"
                )
        end
 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 54d9618db05a1faa5aad4f6f35d344759a20018e..cbe32afde6f5bee40bf06b57ec2282d87a0ff204 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
@@ -200,7 +200,7 @@ function option_install_package(s, tab)
        function p_install.write()
                return luci.http.redirect(
                        luci.dispatcher.build_url("admin/system/opkg") ..
-                       "?submit=1&install=%s" % opkg_package
+                       "?query=%s" % opkg_package
                )
        end
 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 777a874340ee4f3a93fbe193bb17dac5ad713eb6..145f5807a0d05bd62f20099b255036f7c7e9e99e 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/opkg') + '?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...'))

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 05689d389b481f51b7e9c9924a5e738b9f54d3f9..5b230795c3abd6072cc1df3ed92405bbee4d1d4e 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
@@ -227,7 +227,7 @@ if not net:is_installed() then
        function p_install.write()
                return luci.http.redirect(
                        luci.dispatcher.build_url("admin/system/opkg") ..
-                       "?submit=1&install=%s" % net:opkg_package()
+                       "?query=%s" % net:opkg_package()
                )
        end
 end