luci-app-firewall: map proto '*' and 'any' to all on rule config

Before the change, the options '*' and 'any' in the drop down were not
recognized as valid options, when loaded from the uci. With this change,
the options '*' and 'any' are mapped to 'all' and saved as such. This
change is especially important if the proto option is changed manually
to '*' or 'any' in shell and then further configured via LuCI.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 972096bf39c932ad007fb431c81a2f5fab64649f)

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
index e85b6bc6eac114c7828a326b63ca557efa30b4fe..b6f4aef3d09d317a30bc89a1457a18cf23fe4d78 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
@@ -522,6 +522,9 @@ return baseclass.extend({
                                }
                        }, this));
 
+                       if (cfgvalue == '*' || cfgvalue == 'any' || cfgvalue == 'all')
+                               cfgvalue = 'all';
+
                        return cfgvalue;
                },