version 1.181, 2006/10/06 19:04:29
|
version 1.184, 2006/10/23 20:53:46
|
Line 469 sub prettyprint {
|
Line 469 sub prettyprint {
|
($type eq 'sequsage_list') || |
($type eq 'sequsage_list') || |
($type eq 'dependencies')) { |
($type eq 'dependencies')) { |
return '<font size="-1"><ul>'.join("\n",map { |
return '<font size="-1"><ul>'.join("\n",map { |
my $url = &Apache::lonnet::clutter($_); |
my $url = &Apache::lonnet::clutter_with_no_wrapper($_); |
my $title = &Apache::lonnet::gettitle($url); |
my $title = &Apache::lonnet::gettitle($url); |
if ($title eq '') { |
if ($title eq '') { |
$title = 'Untitled'; |
$title = 'Untitled'; |
Line 829 sub present_uneditable_metadata {
|
Line 829 sub present_uneditable_metadata {
|
# displayed url |
# displayed url |
my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); |
my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); |
$uri=~s/\.meta$//; |
$uri=~s/\.meta$//; |
my $disuri=&Apache::lonnet::clutter($uri); |
my $disuri=&Apache::lonnet::clutter_with_no_wrapper($uri); |
$disuri=~s/^\/adm\/wrapper//; |
|
# version |
# version |
my $versiondisplay=''; |
my $versiondisplay=''; |
if (!$uploaded) { |
if (!$uploaded) { |
Line 1193 ENDEDIT
|
Line 1192 ENDEDIT
|
my $output; |
my $output; |
my @fields; |
my @fields; |
my $added_metadata_fields; |
my $added_metadata_fields; |
|
my @added_order; |
if ($file_type eq 'portfolio' || $file_type eq 'groups') { |
if ($file_type eq 'portfolio' || $file_type eq 'groups') { |
if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) { |
if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) { |
# retrieve fieldnames (in order) from the course restricted list |
# retrieve fieldnames (in order) from the course restricted list |
Line 1203 ENDEDIT
|
Line 1203 ENDEDIT
|
'notes','lowestgradelevel', |
'notes','lowestgradelevel', |
'highestgradelevel','standards'); |
'highestgradelevel','standards'); |
$added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames(); |
$added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames(); |
|
if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) { |
|
@added_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}; |
|
} |
$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields); |
$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields); |
} |
} |
} else { |
} else { |
Line 1245 ENDEDIT
|
Line 1248 ENDEDIT
|
$r->print("This resource is not associated with a course.<br />"); |
$r->print("This resource is not associated with a course.<br />"); |
} |
} |
} |
} |
foreach my $field_name(keys (%$added_metadata_fields)) { |
if (@added_order) { |
|
foreach my $field_name(@added_order) { |
push (@fields,$field_name); |
push (@fields,$field_name); |
$lt{$field_name} = $$added_metadata_fields{$field_name}; |
$lt{$field_name} = $$added_metadata_fields{$field_name}; |
|
} |
|
} else { |
|
foreach my $field_name(keys (%$added_metadata_fields)) { |
|
push (@fields,$field_name); |
|
$lt{$field_name} = $$added_metadata_fields{$field_name}; |
|
} |
} |
} |
foreach my $field_name (@fields) { |
foreach my $field_name (@fields) { |
if (defined($env{'form.new_'.$field_name})) { |
if (defined($env{'form.new_'.$field_name})) { |
Line 1258 ENDEDIT
|
Line 1267 ENDEDIT
|
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none' |
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none' |
&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) { |
&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) { |
# handle restrictions here |
# handle restrictions here |
if ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) { |
|
&Apache::lonnet::logthis("the options field ".$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'}); |
|
} |
|
if ((($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) || |
if ((($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) || |
($field_name eq 'courserestricted'))&& |
($field_name eq 'courserestricted'))&& |
(!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){ |
(!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){ |