fix(generator/client): Fixes and improvements

immortalwrt · Jan 16, 2024 · 55038ff · 55038ff
1 parent 8c98045
commit 55038ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/htdocs/luci-static/resources/view/homeproxy/client.js b/htdocs/luci-static/resources/view/homeproxy/client.js
@@ -534,7 +534,7 @@ return view.extend({
 			delete this.keylist;
 			delete this.vallist;
 
-			this.value('null-rule', _('NULL'));
+			this.value('', _('-- Please choose --'));
 			uci.sections(data[0], 'ruleset', (res) => {
 				if (res.enabled === '1')
 					this.value(res['.name'], res.label);
@@ -831,7 +831,7 @@ return view.extend({
 			delete this.keylist;
 			delete this.vallist;
 
-			this.value('null-rule', _('NULL'));
+			this.value('', _('-- Please choose --'));
 			uci.sections(data[0], 'ruleset', (res) => {
 				if (res.enabled === '1')
 					this.value(res['.name'], res.label);

diff --git a/root/etc/homeproxy/scripts/generate_client.uc b/root/etc/homeproxy/scripts/generate_client.uc
@@ -304,16 +304,10 @@ function get_ruleset(cfg) {
 	if (isEmpty(cfg))
 		return null;
 
-	if (type(cfg) === 'array') {
-		if ('null-rule' in cfg)
-			return null;
-
-		let rules = [];
-		for (let i in cfg)
-			push(rules, get_ruleset(i));
-		return rules;
-	} else
-		return 'cfg-' + cfg + '-rule';
+	let rules = [];
+	for (let i in cfg)
+		push(rules, isEmpty(i) ? null : 'cfg-' + i + '-rule');
+	return rules;
 }
 /* Config helper end */