--- loncom/interface/lonmeta.pm	2006/08/16 18:02:01	1.169
+++ loncom/interface/lonmeta.pm	2006/08/21 19:26:27	1.172
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.169 2006/08/16 18:02:01 banghart Exp $
+# $Id: lonmeta.pm,v 1.172 2006/08/21 19:26:27 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -719,7 +719,6 @@ sub prettyinput {
 # Main Handler
 sub handler {
     my $r=shift;
-    #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['currentpath']);
     my $uri=$r->uri;
@@ -728,7 +727,6 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    #
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
     if ($uri=~m:/adm/bombs/(.*)$:) {
@@ -746,6 +744,12 @@ sub handler {
         } else {
             &pre_select_course($r,$uri);
         }
+    } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
+        $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+						 undef,
+						 {'domain' => $resdomain,}));
+						 
+        &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/~|) { 
         # Construction space
         $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
@@ -1106,7 +1110,7 @@ sub print_dynamic_metadata {
 #####################################################
 #####################################################
 sub present_editable_metadata {
-    my ($r,$uri, $file_type) = @_;
+    my ($r,$uri,$file_type) = @_;
     # Construction Space Call
     # Header
     my $disuri=$uri;
@@ -1196,8 +1200,12 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
+        if ($file_type eq 'groups') {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                'course.'.$env{'request.course.id'}; 
+        }
         if ((! $Apache::lonpublisher::metadatafields{'courserestricted'}) &&
-                (! $env{'form.new_courserestricted'})) {
+                (! $env{'form.new_courserestricted'}) && (! $file_type eq 'groups')) {
             $Apache::lonpublisher::metadatafields{'courserestricted'}=
                 'none';
         } elsif ($env{'form.new_courserestricted'}) {
@@ -1208,7 +1216,7 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
 		    'default';
         }
-	if ($file_type eq 'portfolio') {
+	if (($file_type eq 'portfolio') || ($file_type eq 'groups'))  {
 	    if (! $Apache::lonpublisher::metadatafields{'mime'}) {
                 ($Apache::lonpublisher::metadatafields{'mime'}) =
 		    ( $target=~/\.(\w+)$/ );
@@ -1288,14 +1296,14 @@ ENDEDIT
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,
                                                     $new_fn));
                 unless ($env{'form.associate'}) {
-                    $r->print(&Apache::portfolio::done("return",'/adm/portfolio'));
+                    $r->print(&Apache::portfolio::done("Return to Portfolio",'/adm/portfolio'));
                     return;
                 }  
             } elsif ($fn =~  m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/groups/\w+/portfolio/|) {
                 my ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|);
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,$new_fn));
                 unless ($env{'form.associate'}) {
-                    $r->print(&Apache::portfolio::done("return",'/adm/portfolio'));
+                    $r->print(&Apache::portfolio::done("Return to Portfolio",'/adm/portfolio'));
                     return;
                 }  
 	    } else {
@@ -1310,7 +1318,7 @@ ENDEDIT
 			      '</font></p>');
 		}
                 unless ($env{'form.associate'}) {
-                    $r->print(&Apache::portfolio::done("return",'/adm/portfolio'));
+                    $r->print(&Apache::portfolio::done("Return to Portfolio",'/adm/portfolio'));
                     return;
                 }  
 	    }