From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 23 Feb 2020 20:12:54 +0000 (+0100)
Subject: luci-mod-status: hide DHCP status if dnsmasq/odhcpd aren't present
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=4efc7cbbda86280343683a7d1c2563233c499550;p=project%2Fluci.git

luci-mod-status: hide DHCP status if dnsmasq/odhcpd aren't present

Fixes: #3674
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
index b1068f0e36..9975a648ff 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
@@ -9,7 +9,7 @@ var callLuciDHCPLeases = rpc.declare({
 });
 
 return L.Class.extend({
-	title: _('Active DHCP Leases'),
+	title: '',
 
 	load: function() {
 		return Promise.all([
@@ -18,7 +18,7 @@ return L.Class.extend({
 		]);
 	},
 
-	render: function(data) {
+	renderLeases: function(data) {
 		var leases = Array.isArray(data[0].dhcp_leases) ? data[0].dhcp_leases : [],
 		    leases6 = Array.isArray(data[0].dhcp6_leases) ? data[0].dhcp6_leases : [],
 		    machints = data[1].getMACHints(false);
@@ -88,9 +88,17 @@ return L.Class.extend({
 		}), E('em', _('There are no active leases')));
 
 		return E([
+			E('h3', _('Active DHCP Leases')),
 			table,
 			E('h3', _('Active DHCPv6 Leases')),
 			table6
 		]);
+	},
+
+	render: function(data) {
+		if (L.hasSystemFeature('dnsmasq') || L.hasSystemFeature('odhcpd'))
+			return this.renderLeases(data);
+
+		return E([]);
 	}
 });
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
index bb6947d664..01a8e1835a 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
@@ -82,7 +82,7 @@ return L.view.extend({
 			var container = E('div');
 
 			rv.appendChild(E('div', { 'class': 'cbi-section', 'style': 'display:none' }, [
-				E('h3', title),
+				title != '' ? E('h3', title) : '',
 				container
 			]));