From d387c59f5eed8fbb199fea625fcbfa1ac9b2aa75 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:23:07 +0300
Subject: [PATCH] Firewall - categories - check state before select (#5538)

Dont select disabled checkboxes
---
 src/www/firewall_nat.php      | 2 +-
 src/www/firewall_nat_1to1.php | 2 +-
 src/www/firewall_nat_npt.php  | 2 +-
 src/www/firewall_nat_out.php  | 2 +-
 src/www/firewall_rules.php    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index fca2b155f..d158199f1 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -263,7 +263,7 @@ $( document ).ready(function() {
 
   // select All
   $("#selectAll").click(function(){
-      $(".rule_select").prop("checked", $(this).prop("checked"));
+      $(".rule_select:not(:disabled)").prop("checked", $(this).prop("checked"));
   });
 
   // move category block
diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php
index 8d26ff1dc..c3abd7f1e 100644
--- a/src/www/firewall_nat_1to1.php
+++ b/src/www/firewall_nat_1to1.php
@@ -211,7 +211,7 @@ include("head.inc");
     });
     // select All
     $("#selectAll").click(function(){
-        $(".rule_select").prop("checked", $(this).prop("checked"));
+        $(".rule_select:not(:disabled)").prop("checked", $(this).prop("checked"));
     });
 
     // watch scroll position and set to last known on page load
diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php
index bd88207f3..eb5439bb5 100644
--- a/src/www/firewall_nat_npt.php
+++ b/src/www/firewall_nat_npt.php
@@ -161,7 +161,7 @@ include("head.inc");
 
     // select All
     $("#selectAll").click(function(){
-        $(".rule_select").prop("checked", $(this).prop("checked"));
+        $(".rule_select:not(:disabled)").prop("checked", $(this).prop("checked"));
     });
 
     // move category block
diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index d07fa5abb..46ed88ebb 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -228,7 +228,7 @@ include("head.inc");
 
     // select All
     $("#selectAll").click(function(){
-        $(".rule_select").prop("checked", $(this).prop("checked"));
+        $(".rule_select:not(:disabled)").prop("checked", $(this).prop("checked"));
     });
 
     // watch scroll position and set to last known on page load
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index d286cdadb..c9c7b73a5 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -492,7 +492,7 @@ $( document ).ready(function() {
 
   // select All
   $("#selectAll").click(function(){
-      $(".rule_select").prop("checked", $(this).prop("checked"));
+      $(".rule_select:not(:disabled)").prop("checked", $(this).prop("checked"));
   });
 
   // move category block