--- loncom/homework/lonhomework.pm	2011/02/06 18:43:10	1.323
+++ loncom/homework/lonhomework.pm	2011/03/07 19:42:21	1.325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.323 2011/02/06 18:43:10 www Exp $
+# $Id: lonhomework.pm,v 1.325 2011/03/07 19:42:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -147,6 +147,8 @@ sub get_target {
 	} else {
 	    if ($env{'form.problemstate'} eq 'WEB_GRADE') {
 		return ('grade','webgrade','answer');
+            } elsif ($env{'form.problemmode'} eq 'view') {
+                return ('grade','web','answer');
 	    } elsif ($env{'form.problemmode'} eq 'saveview') {
                 return ('modified','web','answer');
             } elsif ($env{'form.problemmode'} eq 'discard') {
@@ -436,7 +438,9 @@ sub check_access {
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
 	    &&
-	    &show_problem_status())
+	    &show_problem_status()
+            &&
+            $Apache::lonhomework::history{"resource.$id.awarded"}==1)
 	   ||
 	   $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	    $status = 'CANNOT_ANSWER';