[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface groupsort.pm

[raeburn]

raeburn		Wed Aug  1 12:52:42 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	groupsort.pm 
  Log:
  - For 2.11.
    - Backport 1.69.
  
  
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.68.6.2 loncom/interface/groupsort.pm:1.68.6.3
--- loncom/interface/groupsort.pm:1.68.6.2	Mon Jun  4 02:17:35 2012
+++ loncom/interface/groupsort.pm	Wed Aug  1 12:52:41 2012
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.68.6.2 2012/06/04 02:17:35 raeburn Exp $
+# $Id: groupsort.pm,v 1.68.6.3 2012/08/01 12:52:41 raeburn Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -411,7 +411,14 @@
 	    $r->print("<td>");
 	    $r->print("<img src='$iconname' />");
 	    $r->print("</td><td>");
-	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
+            if (($env{'form.recover'}) &&
+                ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) {
+                my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'});
+                $r->print($title);
+            } else {
+                $r->print($resource->{'title'});
+            }
+	    $r->print($resource->{'notes'}."</td><td>\n");
 	    $r->print($resource->{'url'}."</td>"
                      .&Apache::loncommon::end_data_table_row()
                      ."\n");