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

[raeburn]

raeburn		Fri Aug 14 10:37:22 2009 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - Only include "Home server" row in "Options" table if the default domain has more than library server.
  - Remove erroneous FIXME comment added in 1.95 about a broken $home_server_pick 
    - it's working just fine and returns a hidden form element, as expected, if the default domain only ciontains a single library server.
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.96 loncom/interface/lonuserutils.pm:1.97
--- loncom/interface/lonuserutils.pm:1.96	Mon Aug  3 16:26:09 2009
+++ loncom/interface/lonuserutils.pm	Fri Aug 14 10:37:22 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.96 2009/08/03 16:26:09 bisitz Exp $
+# $Id: lonuserutils.pm,v 1.97 2009/08/14 10:37:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -788,23 +788,21 @@
             &Apache::loncommon::help_open_topic('Auth_Options').
             "</p>\n";
     }
-    $Str .= &set_login($defdom,$krbform,$intform,$locform)
-           .&Apache::lonhtmlcommon::row_closure();
+    $Str .= &set_login($defdom,$krbform,$intform,$locform);
 
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($defdom,'lcserver',
                                                   'default','hide');
-#FIXME: Broken?!? $home_server_pick returns empty value on prod (2.8.1) and on dev server. SB 2009-08-03
     if ($numlib > 1) {
-        $Str .= &Apache::lonhtmlcommon::row_title(
+        $Str .= &Apache::lonhtmlcommon::row_closure()
+               .&Apache::lonhtmlcommon::row_title(
                     &mt('LON-CAPA Home Server for New Users'))
                .&mt('LON-CAPA domain: [_1] with home server:','"'.$defdom.'"')
                .$home_server_pick
                .&Apache::lonhtmlcommon::row_closure();
     } else {
-        $Str .= &Apache::lonhtmlcommon::row_title(&mt('Home Server'))
-               .$home_server_pick
-               .&Apache::lonhtmlcommon::row_closure();
+        $Str .= $home_server_pick.
+                &Apache::lonhtmlcommon::row_closure();
     }
 
     $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))