From e2c504dbfa615e6dba6b312a1e31e41e52e46de5 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 5 Jul 2007 00:31:51 +0000
Subject: [PATCH] Fix users and groups column alignment

---
 useradmin/user-lib.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl
index 8436c1217..19c36b1d9 100644
--- a/useradmin/user-lib.pl
+++ b/useradmin/user-lib.pl
@@ -1755,7 +1755,10 @@ local $g;
 foreach $g (@$groups) {
 	local $members = join(" ", split(/,/, $g->{'members'}));
 	local @cols;
-	push(@cols, "") if ($anyedit && $g->{'noedit'});
+	if ($anyedit && ($g->{'noedit'} || !$access{'gdelete'})) {
+		# Need an explicity blank first column
+		push(@cols, "");
+		}
 	push(@cols, &group_link($g));
 	push(@cols, $g->{'gid'});
 	push(@cols, &ifblank($members));