summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-07-15 08:44:59 +0930
committerChris Buechler <cmb@pfsense.org>2016-07-14 22:24:20 -0500
commit42f47efc51e826d06f7f968b441e200846da4e26 (patch)
tree13a82a308d498e43e775bf026852a820ceacf3e2
parent8acd654ad290ebcc829fc83346bcc1af59658909 (diff)
downloadpfsense-42f47efc51e826d06f7f968b441e200846da4e26.zip
pfsense-42f47efc51e826d06f7f968b441e200846da4e26.tar.gz
Fix #6613 Do not show Aply Changes button when Save needed
I got a bit carried away in the fix for #6460 https://github.com/pfsense/pfsense/commit/21c18c3df11547aba172c10f95872dbd8682f7d9 The message here at line 507 should not actually show the Apply Changes button. At this point the user needs to adjust the assigned interfaces and save. Then after saving an Apply Changes button can be used to implement the saved changes.
-rw-r--r--src/usr/local/www/interfaces_assign.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php
index 1989b54..20cf1dd 100644
--- a/src/usr/local/www/interfaces_assign.php
+++ b/src/usr/local/www/interfaces_assign.php
@@ -504,7 +504,7 @@ if (file_exists("/var/run/interface_mismatch_reboot_needed")) {
$class = "warning";
}
} else {
- $applymsg = gettext("Interface mismatch detected. Please resolve the mismatch and click 'Apply Changes'. The firewall will reboot afterwards.");
+ $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch, save and then click 'Apply Changes'. The firewall will reboot afterwards.");
$class = "warning";
}
}
OpenPOWER on IntegriCloud