Show primary members on edit group page

diff --git a/useradmin/CHANGELOG b/useradmin/CHANGELOG
index e62123f..7699be8 100644 (file)
--- a/useradmin/CHANGELOG
+++ b/useradmin/CHANGELOG
@@ -49,3 +49,5 @@ The option to force a password change at the next login is available for new use
 Added tabs to the module's page page, to switching between user and group lists easier.
 Cleaned up the user interface to be more consistent with the rest of Webmin.
 Improved support for default password changing options on AIX.
+---- Changes since 1.440 ----
+Added a non-editable list of users who have this group as their primary to the Edit Group page.

diff --git a/useradmin/edit_group.cgi b/useradmin/edit_group.cgi
index f34bd7c..2307b0a 100755 (executable)
--- a/useradmin/edit_group.cgi
+++ b/useradmin/edit_group.cgi
@@ -79,6 +79,28 @@ print &ui_table_row(&hlink($text{'gedit_members'}, "gmembers"),
                10, 1, 0,
                $text{'gedit_allu'}, $text{'gedit_selu'}, 150));
 
+# Primary members (read-only)
+if ($n ne "") {
+       @upri = grep { $_->{'gid'} == $group{'gid'} } @ulist;
+       if (@upri) {
+               @uprilinks = ( );
+               foreach $u (@upri) {
+                       if (&can_edit_user(\%access, $u)) {
+                               push(@uprilinks, "<a href='edit_user.cgi?".
+                                 "num=$u->{'num'}'>$u->{'user'}</a>");
+                               }
+                       else {
+                               push(@uprilinks, $u->{'user'});
+                               }
+                       }
+               $upri = &ui_links_row(\@uprilinks);
+               }
+       else {
+               $upri = $text{'gedit_prinone'};
+               }
+       print &ui_table_row(&hlink($text{'gedit_pri'}, "gpri"), $upri, 3);
+       }
+
 print &ui_table_end();
 
 # Section for on-change and on-create events

diff --git a/useradmin/help/gpri.html b/useradmin/help/gpri.html
new file mode 100644 (file)
index 0000000..ea15394
--- /dev/null
+++ b/useradmin/help/gpri.html
@@ -0,0 +1,9 @@
+<header>Primary group members</header>
+
+This field lists all users who have this group as their primary group.
+Because a user must always have exactly one primary group, membership cannot
+be changed here - instead, you must do it on the Edit User page, which can
+be reached by clicking on a user's name. <p>
+
+<footer>
+

diff --git a/useradmin/lang/en b/useradmin/lang/en
index 8223ea8..231046b 100644 (file)
--- a/useradmin/lang/en
+++ b/useradmin/lang/en
@@ -191,6 +191,8 @@ gedit_gid_calc=Calculated
 gedit_gid_def=Automatic
 gedit_allu=All users
 gedit_selu=Users in group
+gedit_pri=Primary group members
+gedit_prinone=No users have this group as their primary
 
 gsave_err=Failed to save group
 gsave_eedit=You cannot edit this group