From: Paul Donald <newtwen+github@gmail.com>
Date: Mon, 2 Dec 2024 19:56:05 +0000 (+0100)
Subject: luci-app-upnp: Critical hotfix revert 7a7f9ec
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b1253c41f5391c25e03114d348e50d03f19b8a0;p=project%2Fluci.git

luci-app-upnp: Critical hotfix revert 7a7f9ec

Revert "luci-app-upnp: remove dangling lines and split translations"
This reverts commit 7a7f9ec, as it introduced a regression.

Close #7444

Signed-off-by: Self-Hosting-Group <selfhostinggroup-git+openwrt@shost.ing>
---

diff --git a/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js b/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
index dcb6963734..3173fb35bc 100644
--- a/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
+++ b/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
@@ -37,6 +37,7 @@ return baseclass.extend({
 	},
 
 	render: function(data) {
+
 		var table = E('table', { 'class': 'table', 'id': 'upnp_status_table' }, [
 			E('tr', { 'class': 'tr table-titles' }, [
 				E('th', { 'class': 'th' }, _('Client Name')),
@@ -50,6 +51,7 @@ return baseclass.extend({
 		]);
 
 		var rules = Array.isArray(data[0].rules) ? data[0].rules : [];
+
 		var rows = rules.map(function(rule) {
 			return [
 				rule.host_hint || _('Unknown'),
@@ -64,7 +66,9 @@ return baseclass.extend({
 				}, [ _('Delete') ])
 			];
 		});
+
 		cbi_update_table(table, rows, E('em', _('There are no active port maps.')));
+
 		return table;
 	}
 });
diff --git a/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js b/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
index a51cd72a01..f216dd0e1c 100644
--- a/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
+++ b/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
@@ -45,7 +45,9 @@ return view.extend({
 	},
 
 	poll_status: function(nodes, data) {
+
 		var rules = Array.isArray(data[0].rules) ? data[0].rules : [];
+
 		var rows = rules.map(function(rule) {
 			return [
 				rule.host_hint || _('Unknown'),
@@ -60,10 +62,14 @@ return view.extend({
 				}, [ _('Delete') ])
 			];
 		});
+
 		cbi_update_table(nodes.querySelector('#upnp_status_table'), rows, E('em', _('There are no active port maps.')));
+
+		return;
 	},
 
 	render: function(data) {
+
 		var m, s, o;
 
 		var protocols = '%s & %s/%s'.format(
@@ -92,6 +98,7 @@ return view.extend({
 			]);
 
 			var rules = Array.isArray(data[0].rules) ? data[0].rules : [];
+
 			var rows = rules.map(function(rule) {
 				return [
 					rule.host_hint || _('Unknown'),
@@ -106,7 +113,9 @@ return view.extend({
 					}, [ _('Delete') ])
 				];
 			});
+
 			cbi_update_table(table, rows, E('em', _('There are no active port maps.')));
+
 			return E('div', { 'class': 'cbi-section cbi-tblsection' }, [
 					E('h3', _('Active Service Port Maps')), table ]);
 		}, o, this);
@@ -120,11 +129,9 @@ return view.extend({
 			_('Start autonomous port mapping service'));
 		o.rmempty = false;
 
-		s.taboption('setup', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol'))
-		s.default = '1';
+		s.taboption('setup', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol')).default = '1';
 
-		s.taboption('setup', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocols'))
-		s.default = '1';
+		s.taboption('setup', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocols')).default = '1';
 
 		o = s.taboption('setup', form.Flag, 'igdv1', _('UPnP IGDv1 compatibility mode'),
 			_('Advertise as IGDv1 (IPv4 only) device instead of IGDv2'));