[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

[albertel]

albertel		Thu Jun 16 18:25:38 2005 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - course init helper should defeat what'snew (Bug# 4132)
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.123 loncom/auth/lonroles.pm:1.124
--- loncom/auth/lonroles.pm:1.123	Mon Jun  6 20:24:08 2005
+++ loncom/auth/lonroles.pm	Thu Jun 16 18:25:34 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.123 2005/06/07 00:24:08 www Exp $
+# $Id: lonroles.pm,v 1.124 2005/06/16 22:25:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,20 +260,19 @@
 			    if ($role eq 'cc' && $env{'course.' . $courseid . 
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
+				# Send the user to the course they selected
+			    } elsif (($env{'request.course.fn'}) 
+				     && ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
+				$msg = &mt('Entering course ....');
+				&redirect_user($r,&mt('New in course'),
+					       '/adm/whatsnew',$msg,
+					       $env{'environment.remotenavmap'});
+				return OK;
 			    }
-                            # Send the user to the course they selected
-                            if (($env{'request.course.fn'}) 
-				&& ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
-                                $msg = &mt('Entering course ....');
-                                &redirect_user($r,&mt('New in course'),
-                                      '/adm/whatsnew',$msg,
-                                      $env{'environment.remotenavmap'});
-                            } else {
-                                &redirect_user($r,&mt('Entering Course'),
+			    &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
 					   $env{'environment.remotenavmap'});
-                            }
-                            return OK;
+			    return OK;
 			}
 		    }
                     #