Diff for /loncom/interface/lonmeta.pm between versions 1.183 and 1.184

version 1.183, 2006/10/16 21:39:37 version 1.184, 2006/10/23 20:53:46
Line 1192  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 1202  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 1244  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})) {

Removed from v.1.183  
changed lines
  Added in v.1.184


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>