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

[raeburn]

raeburn		Mon Dec 31 15:28:36 2012 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm lonuserutils.pm 
  Log:
  - Information to show in user list.
  - Don't gray out role checkbox, if custom role selected as role to show.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.370 loncom/interface/loncreateuser.pm:1.371
--- loncom/interface/loncreateuser.pm:1.370	Fri Dec 28 04:12:32 2012
+++ loncom/interface/loncreateuser.pm	Mon Dec 31 15:28:36 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.370 2012/12/28 04:12:32 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.371 2012/12/31 15:28:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4604,7 +4604,8 @@
         }
     }
     if (caller == 'showrole') {
-        if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') {
+        if ((document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') ||
+            (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'cr')) {
             document.getElementById('showcolrole').checked = true;
             document.getElementById('showcolrole').disabled = '';
         } else {
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.145 loncom/interface/lonuserutils.pm:1.146
--- loncom/interface/lonuserutils.pm:1.145	Tue Dec 18 15:35:42 2012
+++ loncom/interface/lonuserutils.pm	Mon Dec 31 15:28:36 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.145 2012/12/18 15:35:42 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.146 2012/12/31 15:28:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1907,8 +1907,8 @@
         if ($env{'form.Status'} ne 'Any') {
             $disabledchk{'status'} = 1;
         }
-        if ($env{'form.showrole'} ne 'Any') {
-            $disabledchk{'role'} = 1; 
+        if (($env{'form.showrole'} ne 'Any') && ($env{'form.showrole'} ne 'cr')) {
+            $disabledchk{'role'} = 1;
         }
     }
     my $numposs = scalar(@cols);