--- loncom/interface/loncoursegroups.pm 2006/05/09 14:38:09 1.15
+++ loncom/interface/loncoursegroups.pm 2006/05/09 15:09:27 1.16
@@ -454,9 +454,8 @@ sub group_administration {
(($state eq 'pick_name') || ($state eq 'pick_privs'))) ||
(($action eq 'modify') && (($state eq 'change_settings') ||
($state eq 'add_members')))) {
- my $numsections = &Apache::loncommon::get_sections($cdom,$cnum,
- \%sectioncount);
- if ($numsections > 0) {
+ %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
+ if (%sectioncount) {
$elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox';
$elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox';
$elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox';
@@ -3410,8 +3409,7 @@ function toggleTools(field,caller) {
sub validate_groupname {
my ($groupname,$action,$cdom,$cnum) = @_;
- my %sectioncount;
- my $numsec=&Apache::loncommon::get_sections($cdom,$cnum,\%sectioncount);
+ my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
my %lt = &Apache::lonlocal::texthash (
@@ -3436,12 +3434,9 @@ sub validate_groupname {
$earlyout = $exitmsg.$lt{'isno'}.'
'.$lt{'gnmo'};
return $earlyout;
}
- if ($numsec) {
- if (exists($sectioncount{$groupname})) {
- $earlyout = $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
- '
'.$lt{'grna'};
- return $earlyout;
- }
+ if (exists($sectioncount{$groupname})) {
+ return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
+ '
'.$lt{'grna'};
}
if ($action eq 'create'
&& exists($curr_groups{$groupname})) {