--- loncom/interface/domainprefs.pm 2009/08/23 12:40:50 1.102.2.2
+++ loncom/interface/domainprefs.pm 2009/10/02 16:36:09 1.102.4.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.102.2.2 2009/08/23 12:40:50 raeburn Exp $
+# $Id: domainprefs.pm,v 1.102.4.3 2009/10/02 16:36:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1348,15 +1348,15 @@ sub print_quotas {
$datatable .= '
'.
''.&mt('LON-CAPA Advanced Users').' ';
if ($context eq 'requestcourses') {
- $datatable .= &mt('(overrides affiliation, if set)');
- } else {
- $datatable .= &mt('(overrides affiliation, if checked)');
- }
- $datatable .= ' | '.
- if ($context eq 'requestcourses') {
- $datatable .= '';
+ $datatable .= &mt('(overrides affiliation, if set)').
+ ''.
+ ''.
+ '';
} else {
- $datatable .= ' ';
+ $datatable .= &mt('(overrides affiliation, if checked)').
+ ''.
+ ''.
+ ' ';
}
my %advcell;
foreach my $item (@usertools) {
@@ -1370,9 +1370,6 @@ sub print_quotas {
}
}
}
- if (!$curroption) {
- $curroption = 'norequest';
- }
$datatable .= ' | '.$titles{$item}.' | ';
my $checked = '';
if ($curroption eq '') {
@@ -2663,6 +2660,7 @@ sub coursecategories_javascript {
}
$output = <<"ENDSCRIPT";
ENDSCRIPT
@@ -5013,7 +5012,8 @@ sub modify_defaults {
if ($newvalues{$item} ne '') {
if ($newvalues{$item} =~ /^(\w+)/) {
my $langcode = $1;
- if ($langcode ne 'x_chef') {
+ if (($langcode ne 'gci') && ($langcode ne 'gct') &&
+ ($langcode ne 'x_chef')) {
if (code2language($langcode) eq '') {
push(@errors,$item);
}
|