diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-08-05 07:48:29 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-08-05 07:48:29 -0300 |
commit | 4c4c59b94d3054266e34601b48a7d495c8bf9e38 (patch) | |
tree | a6285d4b20de72b2958faec8e9577a73cdb39af1 | |
parent | 46f6eb78926c1f7e55bb74596338e107be6fabed (diff) | |
download | pfsense-4c4c59b94d3054266e34601b48a7d495c8bf9e38.zip pfsense-4c4c59b94d3054266e34601b48a7d495c8bf9e38.tar.gz |
Make sure there are not empty options on dst select to avoid creating empty user or group. This issue was introduced by b4e9a4da
-rw-r--r-- | usr/local/www/system_groupmanager.php | 6 | ||||
-rw-r--r-- | usr/local/www/system_usermanager.php | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index b2e65f7..cd6cf9b 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -210,6 +210,12 @@ function remove_selected(id) { function copy_selected(srcid, dstid) { src_selbox = document.getElementById(srcid); dst_selbox = document.getElementById(dstid); + count = dst_selbox.options.length; + for (index = count - 1; index >= 0; index--) { + if (dst_selbox.options[index].value == '') { + dst_selbox.remove(index); + } + } count = src_selbox.options.length; for (index = 0; index < count; index++) { if (src_selbox.options[index].selected) { diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 87bd0f5..ddb8320 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -393,6 +393,12 @@ function remove_selected(id) { function copy_selected(srcid, dstid) { src_selbox = document.getElementById(srcid); dst_selbox = document.getElementById(dstid); + count = dst_selbox.options.length; + for (index = count - 1; index >= 0; index--) { + if (dst_selbox.options[index].value == '') { + dst_selbox.remove(index); + } + } count = src_selbox.options.length; for (index = 0; index < count; index++) { if (src_selbox.options[index].selected) { |