From 4c4c59b94d3054266e34601b48a7d495c8bf9e38 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 5 Aug 2014 07:48:29 -0300 Subject: [PATCH] Make sure there are not empty options on dst select to avoid creating empty user or group. This issue was introduced by b4e9a4da --- usr/local/www/system_groupmanager.php | 6 ++++++ usr/local/www/system_usermanager.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index b2e65f7256..cd6cf9b9b3 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 87bd0f5684..ddb8320369 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) {