[BACK]Return to lonmeta.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmeta.pm between versions 1.155 and 1.157

version 1.155, 2006/05/20 06:34:50 version 1.157, 2006/05/30 12:46:09
Line 39  use Apache::lonpublisher; Line 39  use Apache::lonpublisher;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmysql;  use Apache::lonmysql;
 use Apache::lonmsg;  use Apache::lonmsg;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
   
 ############################################################  ############################################################
Line 108  sub get_dynamic_metadata_from_sql { Line 110  sub get_dynamic_metadata_from_sql {
             next if (! $result);              next if (! $result);
             my @Data =               my @Data = 
                 map {                   map { 
                     &Apache::lonnet::unescape($_);                       &unescape($_); 
                 } split(',',$result);                  } split(',',$result);
             my $url = $Data[0];              my $url = $Data[0];
             for (my $i=0;$i<=$#Fields;$i++) {              for (my $i=0;$i<=$#Fields;$i++) {
Line 318  sub portfolio_linked_path { Line 320  sub portfolio_linked_path {
     return $result;      return $result;
 }  }
   
 sub portfolio_display_uri {  sub get_port_path_and_group {
     my ($uri,$as_links)=@_;      my ($uri)=@_;
   
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
   
     my ($port_path,$group);      my ($port_path,$group);
     if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {      if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {
  $group = (split('/',$uri))[5];   $group = (split('/',$uri))[5];
Line 329  sub portfolio_display_uri { Line 333  sub portfolio_display_uri {
     } else {      } else {
  $port_path = '/adm/portfolio';   $port_path = '/adm/portfolio';
     }      }
       return ($port_path,$group);
   }
   
   sub portfolio_display_uri {
       my ($uri,$as_links)=@_;
   
       my ($port_path,$group) = &get_port_path_and_group($uri);
   
     $uri =~ s|.*/(portfolio/.*)$|$1|;      $uri =~ s|.*/(portfolio/.*)$|$1|;
     my ($res_uri,$meta_uri) = ($uri,$uri);      my ($res_uri,$meta_uri) = ($uri,$uri);
     if ($uri =~ /\.meta$/) {      if ($uri =~ /\.meta$/) {
Line 365  sub pre_select_course { Line 377  sub pre_select_course {
                   &mt('Associate Resource With Selected Course').'">');                    &mt('Associate Resource With Selected Course').'">');
     $r->print('</form>');      $r->print('</form>');
           
     $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.      my ($port_path,$group) = &get_port_path_and_group($uri);
       $r->print('<br /><br /><form method="POST" action="'.$port_path.'">'.
               '<input type="hidden" name="currentpath" value="'.$path.'" />'.                '<input type="hidden" name="currentpath" value="'.$path.'" />'.
         '<input type="hidden" name="group" value="'.$group.'" />'.
       '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.        '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
       '</form>');        '</form>');
   
Line 1284  ENDEDIT Line 1298  ENDEDIT
                   &mt('Store Catalog Information').'">');                    &mt('Store Catalog Information').'">');
   
  if ($file_type eq 'portfolio') {   if ($file_type eq 'portfolio') {
       my ($port_path,$group) = &get_port_path_and_group($uri);
     $r->print('</form>      $r->print('</form>
                <br /><br /><form method="POST" action="/adm/portfolio">'.                 <br /><br /><form method="POST" action="'.$port_path.'">'.
         '<input type="hidden" name="group" value="'.$group.'" />'.
       '<input type="hidden" name="currentpath" value="'.$path.'" />'.        '<input type="hidden" name="currentpath" value="'.$path.'" />'.
       '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');        '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
  }   }
Removed from v.1.155  
changed lines
  Added in v.1.157

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