[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface lonnavmaps.pm

[www]

www		Tue Nov 22 11:39:46 2005 EDT

  Modified files:              
    /loncom/homework	grades.pm 
    /loncom/interface	lonnavmaps.pm 
  Log:
  Bug #2644: Grading feedback shows as envelope in NAV.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.294 loncom/homework/grades.pm:1.295
--- loncom/homework/grades.pm:1.294	Tue Nov 15 10:55:11 2005
+++ loncom/homework/grades.pm	Tue Nov 22 11:39:34 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.294 2005/11/15 15:55:11 albertel Exp $
+# $Id: grades.pm,v 1.295 2005/11/22 16:39:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1967,6 +1967,7 @@
 	    my ($subject,$message,$msgstatus) = ('','','');
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
 		$subject = $env{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+		unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
 		my (@msgnum) = split(/,/,$includemsg);
 		foreach (@msgnum) {
 		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
@@ -1977,7 +1978,8 @@
 		    &Apache::lonnet::clutter($url).
 		    "?symb=$symb\">$env{'form.probTitle'}</a>";
 		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
-							       $env{'form.msgsub'},$message);
+							       $env{'form.msgsub'}.' ['.
+							       &Apache::lonnet::declutter($url).']',$message);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
 		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.350 loncom/interface/lonnavmaps.pm:1.351
--- loncom/interface/lonnavmaps.pm:1.350	Mon Nov 21 21:24:50 2005
+++ loncom/interface/lonnavmaps.pm	Tue Nov 22 11:39:45 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.350 2005/11/22 02:24:50 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.351 2005/11/22 16:39:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2230,9 +2230,9 @@
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
 	    my $plain=
 		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-		my ($what,$url)=($1,$2);
-		if ($what eq 'Error') {
+	    if ($plain=~/ \[([^\]]+)\]\:/) {
+		my $url=$1;
+		if ($plain=~/\:Error \[/) {
 		    $error{$url}.=','.$msgid; 
 		} else {
 		    $feedback{$url}.=','.$msgid;