Firewall / Rules - Page Efficiency Upgrade

1) Only load the rules of the selected interface instead of loading all the rules of all interfaces and hiding them.  Very inefficient and can result in sluggishness.  Especially with large number of rules and/or large alias tables.

1.1) Rule separators indexed to their position within their interface so they work with only loading the selected interface rules.

2) Supports consecutive separators.

3) Fixes #5559 - horizontal scrollbar when no rules to display (all hidden).  No longer hiding rules.

4) Corrects case where a single rule defined on any interface would prevent the alert messages from being displayed on all interfaces.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index 76aaf51..5d33d83 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -553,15 +553,15 @@ $('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el)
 
 	// Compose an inout array containing the row #, color and text for each separator
 	function save_separators() {
-		var seprow = 0;
+		var row = 0;
 		var sepinput;
 		var sepnum = 0;
 
 		$('#ruletable > tbody > tr').each(function() {
 			if ($(this).hasClass('separator')) {
-				seprow = $(this).prev('tr').attr("id");
+				seprow = $(this).next('tr').attr("id");
 				if (seprow == undefined) {
-					seprow = "fr-1";
+					seprow = "fr" + row;
 				}
 
 				sepinput = '<input type="hidden" name="separator[' + sepnum + '][row]" value="' + seprow + '"></input>';
@@ -573,10 +573,10 @@ $('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el)
 				sepinput = '<input type="hidden" name="separator[' + sepnum + '][if]" value="' + iface + '"></input>';
 				$('form').append(sepinput);
 				sepnum++;
-			}
-
-			if ($(this).parent('tbody').hasClass('user-entries')) {
-				seprow++;
+			} else {
+				if ($(this).parent('tbody').hasClass('user-entries')) {
+					row++;
+				}
 			}
 		});
 	}