[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncoursegroups.pm

[raeburn]

raeburn		Mon Jan 25 22:19:55 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	loncoursegroups.pm 
  Log:
  - Backport 1.103, 1.107.
  
  
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.101 loncom/interface/loncoursegroups.pm:1.101.4.1
--- loncom/interface/loncoursegroups.pm:1.101	Mon May 11 16:51:27 2009
+++ loncom/interface/loncoursegroups.pm	Mon Jan 25 22:19:55 2010
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.101 2009/05/11 16:51:27 bisitz Exp $
+# $Id: loncoursegroups.pm,v 1.101.4.1 2010/01/25 22:19:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1888,7 +1888,8 @@
         }
     }
     &privilege_specificity($r,$action,$specimg,$tools,$stored,$toolprivs,
-                          $fixedprivs,\@available,$formname,$gpterm,$ucgpterm);
+                          $fixedprivs,\@available,$formname,$gpterm,$ucgpterm,
+                          $functions);
     my $newusers = &pick_new_members($r,$action,$formname,\@available,$idx,
 				     $stored,$memimg,$users,$userdata,
 				     $granularity,\%origmembers,$gpterm,
@@ -2297,9 +2298,9 @@
 	      &Apache::lonhtmlcommon::row_title($lt{'func'},undef,
      						'LC_groups_functionality'));
     my @tableHeader;
-    foreach my $key (sort(keys(%{$functions}))){
-        push (@tableHeader,&mt(${$functions}{$key}));
-    }   
+    if ((ref($functions) eq 'HASH') && (ref($tools) eq 'ARRAY')) {
+        @tableHeader = map { $functions->{$_}; } @{$tools};
+    }
  $r->print(join('</td><td class="LC_groups_functionality">', @tableHeader));
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     my $fixed = '';