From 7f2dab08fa690f43cf9e5fd5fde270d211927c37 Mon Sep 17 00:00:00 2001 From: Len Kranendonk Date: Sun, 8 Aug 2004 12:30:03 +0000 Subject: [PATCH] Bugfix: [ 1003511 ] Users cannot be added to Registered Users if removed --- docs/changelog/6.x.x.txt | 2 +- lib/WebGUI/Operation/User.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 7bf22f208..e6e77807b 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -29,7 +29,7 @@ - Bugfix: [ 1003594 ] Fixed Navigation Cacheing bug - Bugfix: [ 1000299 ] laodAllConfigs should be loadAllConfigs? - Bugfix: [ 995088 ] Error in printable macro 6.1.1 - + - Bugfix: [ 1003511 ] Users cannot be added to Registered Users if removed 6.1.1 - bugfix [ 991313 ] Manage Translations doesn't work diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 794a4f0ef..f44a19e84 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -425,7 +425,7 @@ sub www_editUserGroup { ''.WebGUI::International::get(369).''; my $p = WebGUI::Paginator->new("op=editUserGroups&uid=".$session{form}{uid}); $p->setDataByQuery("select groups.groupId,groups.groupName,groupings.expireDate - from groupings,groups where groupings.groupId=groups.groupId and groupings.userId=$session{form}{uid} order by groups.groupName"); + from groupings,groups where groupings.groupId=groups.groupId and groupings.userId=$session{form}{uid} and groups.isEditable > 0 order by groups.groupName"); foreach my $row (@{$p->getPageData}) { $output .= '' .WebGUI::Form::checkbox({