diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-16 09:26:03 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-16 09:26:03 -0400 |
commit | 1ef5a1ce4fdf0be9caefac4420b815a4e2768e35 (patch) | |
tree | 10df661e75a8b87c009743002215633292d385de /src/usr/local/www/load_balancer_pool_edit.php | |
parent | 66513c5a40dab03961ce16d0ec065e3db08e4cf3 (diff) | |
download | pfsense-1ef5a1ce4fdf0be9caefac4420b815a4e2768e35.zip pfsense-1ef5a1ce4fdf0be9caefac4420b815a4e2768e35.tar.gz |
Fixed $5050
serversdisabled list filtered to remove blank entry
Diffstat (limited to 'src/usr/local/www/load_balancer_pool_edit.php')
-rw-r--r-- | src/usr/local/www/load_balancer_pool_edit.php | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 95dbfee..90550c8 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -272,7 +272,7 @@ events.push(function(){ $("#removedisabled").click(function() { $('[name="serversdisabled[]"] option:selected').remove(); }); - + $("#movetodisabled").click(function() { moveOptions($('[name="servers[]"] option'), $('[name="serversdisabled[]"]')); }); @@ -390,11 +390,20 @@ $section = new Form_Section('Current pool members'); $group = new Form_Group('Members'); +$list = array(); + +if (is_array($pconfig['serversdisabled'])) { + foreach ($pconfig['serversdisabled'] as $svrent) { + if ($svrent != '') + $list[$svrent] = $svrent; + } +} + $group->add(new Form_Select( 'serversdisabled', null, $pconfig['serversdisabled'], - is_array($pconfig['serversdisabled']) ? array_combine($pconfig['serversdisabled'], $pconfig['serversdisabled']) : array(), + $list, true ))->setHelp('Disabled'); @@ -452,13 +461,13 @@ print($form); <script> //<![CDATA[ events.push(function(){ - - // --------- Autocomplete ----------------------------------------------------------------------------------------- - var customarray = <?= json_encode(get_alias_list(array("port", "url_ports", "urltable_ports"))) ?>; - $('#port').autocomplete({ - source: customarray - }); + // --------- Autocomplete ----------------------------------------------------------------------------------------- + var customarray = <?= json_encode(get_alias_list(array("port", "url_ports", "urltable_ports"))) ?>; + + $('#port').autocomplete({ + source: customarray + }); }); //]]> </script> |