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

[albertel]

albertel		Tue Dec  9 16:25:53 2003 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - people don't like the roles mixed, so first sort on role then domain then course title
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.79 loncom/auth/lonroles.pm:1.80
--- loncom/auth/lonroles.pm:1.79	Mon Dec  8 09:25:15 2003
+++ loncom/auth/lonroles.pm	Tue Dec  9 16:25:53 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.79 2003/12/08 14:25:15 sakharuk Exp $
+# $Id: lonroles.pm,v 1.80 2003/12/09 21:25:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -445,7 +445,7 @@
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
                         $twhere=$ENV{'course.'.$tcourseid.'.description'};
-			$sortkey=$tdom."\0".$twhere."\0".$envkey;
+			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         unless ($twhere eq &mt('Currently not available')) {
 			    $twhere.=' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -455,7 +455,7 @@
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-			    $sortkey=$tdom."\0".$newhash{'description'}.
+			    $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
 				"\0".$envkey;
                             $twhere=$newhash{'description'}.
                               ' <font size="-2">'.
@@ -464,7 +464,7 @@
                         } else {
                             $twhere=&mt('Currently not available');
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$tdom."\0".$twhere."\0".$envkey;
+			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }