[LON-CAPA-cvs] cvs: loncom /interface grouproster.pm

[raeburn]

raeburn		Fri Jul  7 20:59:23 2006 EDT

  Modified files:              
    /loncom/interface	grouproster.pm 
  Log:
  group homepage is now smppg instead of grppg in breadcrumbs link. Also list of groups retrieved from longroup::coursegroups() instead of environment var so it is current.   
  
  
Index: loncom/interface/grouproster.pm
diff -u loncom/interface/grouproster.pm:1.1 loncom/interface/grouproster.pm:1.2
--- loncom/interface/grouproster.pm:1.1	Sun Jul  2 14:01:47 2006
+++ loncom/interface/grouproster.pm	Fri Jul  7 20:59:22 2006
@@ -31,6 +31,7 @@
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::longroup;
+use LONCAPA;
 use Apache::Constants qw(:common :http);
 use lib '/home/httpd/lib/perl/';
 
@@ -77,11 +78,11 @@
         $r->print(&mt('Invalid [_1]',$crstype));
     }
 
-    my @coursegroups = split(/:/,$env{'request.course.groups'});
-    if ((@coursegroups == 0) || ((@coursegroups > 0) && 
-                                 (!(grep/^\Q$group\E$/,@coursegroups)))) {
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+    if (!defined($curr_groups{$group})) {
         $r->print(&mt('[_1] is not the name of a valid [_2] in this [_3].',
                       $group,$gpterm,lc($crstype)));
+        return OK;
     } 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -97,8 +98,7 @@
         $r->print(&mt('You do not have privileges to view the membership roster in this [_1]',$gpterm));
         return OK;
     }
-    my %coursegroups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-    my %content = &Apache::longroup::get_group_settings($coursegroups{$group});
+    my %content = &Apache::longroup::get_group_settings($curr_groups{$group});
     my $description = &unescape($content{'description'});
     $r->print(&roster_header($cdom,$cnum,$group,$description,$gpterm,$ucgpterm));
 
@@ -128,7 +128,7 @@
                                        '<script type="text/javascript">'.
                                        $jscript.'</script>');
     &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/$cdom/$cnum/$group/grppg",
+        ({href=>"/adm/$cdom/$cnum/$group/smppg",
           text=>"$ucgpterm: $description",
           title=>"Go to group's home page"},
          {href=>"/adm/grouproster?group=$group",
@@ -203,8 +203,8 @@
     if (ref($numitems) eq 'HASH') {
         foreach my $key (keys(%{$numitems})) {
             if ($status eq $key && !$$numitems{$key}) {
-                $r->print(&mt('There are no [_1] members to display in this [_2]',
-                              $key,$gpterm));
+                $r->print(&mt('There are no [_1]s to display in this [_2].',
+                              lc($lt{$key}),$gpterm));
                 return;
             }
         }