From: Florian Eckert <fe@dev.tdt.de>
Date: Mon, 11 Dec 2017 09:20:23 +0000 (+0100)
Subject: luci-app-firewall: show port opening cbi section independently of lan zone definition
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=93c830869dde03c726180482554d47b3d3a3cf4b;p=project%2Fluci.git

luci-app-firewall: show port opening cbi section independently of lan zone definition

Current the append traffic rules for "port forwarding" and "port opening"
to the router are only shown if 'wan' and 'lan' zone are defined at
once.

For "port opening" to the router only need a 'wan' zone. Removing
'lan' zone dependency for 'port opening' reflect this behavior.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
index 463b2e05f4..58121c4203 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -5,7 +5,7 @@
 %>
 
 <div class="cbi-section-create cbi-tblsection-create">
-	<% if wz and lz then %>
+	<% if wz then %>
 		<br />
 		<table class="cbi-section-table" style="margin-left:5px">
 			<tr class="cbi-section-table-titles">
@@ -37,7 +37,8 @@
 				</td>
 			</tr>
 		</table>
-
+	<% end %>
+	<% if wz and lz then %>
 		<table class="cbi-section-table" style="margin-left:5px">
 			<tr class="cbi-section-table-titles">
 				<th class="cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</th>
@@ -71,7 +72,11 @@
 				</td>
 			</tr>
 		</table>
+	<% else %>
+		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+	<% end %>
 
+	<% if wz then %>
 		<script type="text/javascript">//<![CDATA[
 			cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
 			cbi_bind(document.getElementById('_newopen.extport'), 'blur',
@@ -106,7 +111,5 @@
 
 			cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');
 		//]]></script>
-	<% else %>
-		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
 	<% end %>
 </div>