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

bisitz bisitz at source.lon-capa.org
Wed Feb 5 13:02:16 EST 2014


bisitz		Wed Feb  5 18:02:16 2014 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm loncreateuser.pm 
  Log:
  Improve "Disable Safeguard" output and code:
  - Moved safeguard directly to id field ("Modify existing user" context)
  - Keep safeguard in pick_box ("Upload Users List" context)
  - Optimized separation of content data and HTML output
  
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.160 loncom/interface/lonuserutils.pm:1.161
--- loncom/interface/lonuserutils.pm:1.160	Tue Dec 24 19:15:11 2013
+++ loncom/interface/lonuserutils.pm	Wed Feb  5 18:02:15 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.160 2013/12/24 19:15:11 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.161 2014/02/05 18:02:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1013,7 +1013,9 @@
                .&Apache::lonhtmlcommon::row_closure();
     }
     if ($context eq 'course' || $context eq 'domain') {
-        $Str .= &forceid_change($context);
+        $Str .= &Apache::lonhtmlcommon::row_title(&mt('Student/Employee ID'))
+               .&forceid_change($context)
+               .&Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
     }
 
     $Str .= &Apache::lonhtmlcommon::end_pick_box();
@@ -1078,8 +1080,7 @@
 sub forceid_change {
     my ($context) = @_;
     my $output = 
-        &Apache::lonhtmlcommon::row_title(&mt('Student/Employee ID'))
-       .'<label><input type="checkbox" name="forceid" value="yes" />'
+        '<label><input type="checkbox" name="forceid" value="yes" />'
        .&mt('Disable Student/Employee ID Safeguard and force change of conflicting IDs')
        .'</label><br />'."\n"
        .&mt('(only do if you know what you are doing.)')."\n";
@@ -1089,7 +1090,6 @@
   &mt('Update student/employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
                    '</label>'."\n";
     }
-    $output .= &Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
     return $output;
 }
 
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.387 loncom/interface/loncreateuser.pm:1.388
--- loncom/interface/loncreateuser.pm:1.387	Wed Jan 22 18:01:43 2014
+++ loncom/interface/loncreateuser.pm	Wed Feb  5 18:02:16 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.387 2014/01/22 18:01:43 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.388 2014/02/05 18:02:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1273,6 +1273,7 @@
         my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
+        # (Do not offer Disable Safeguard here)
         $r->print($personal_table);
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1381,13 +1382,10 @@
         }
         $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
                   "\n".'<div class="LC_left_float">');
-        my ($personal_table,$showforceid) = 
+        my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
-        if ($showforceid) {
-            $r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>');
-        }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
@@ -2170,7 +2168,7 @@
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
-    my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
+    my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
@@ -2257,8 +2255,8 @@
             } else {
                 $row .= $userenv{$item};
             }
-            if ($item eq 'id') {
-                $showforceid = $canmodify{$item};
+            if (($item eq 'id') && ($canmodify{$item})) {
+                 $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
             }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2309,7 +2307,7 @@
         if ($context eq 'selfcreate') {
             return($output,$rowcount,$editable);
         } else {
-            return ($output,$showforceid);
+            return $output;
         }
     } else {
         return $output;




More information about the LON-CAPA-cvs mailing list