webgli/extrapackages: list-type fix

  webgli/services: same
  glimd: add/edit_client updates.

5 files changed, 28 insertions, 6 deletions

diff --git a/src/installer/ChangeLog b/src/installer/ChangeLog
index f8bd25b318..bd17a34dbb 100644
--- a/src/installer/ChangeLog
+++ b/src/installer/ChangeLog
@@ -1,7 +1,7 @@
 # ChangeLog for Gentoo Linux Installer
 # Copyright 2005-2005 Gentoo Technologies, Inc.
 
-# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.579 2006/01/15 21:29:08 codeman Exp $
+# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.580 2006/01/15 23:01:01 codeman Exp $
 
 *GLI-0.3 (27 Oct 2005)
 
@@ -9,6 +9,9 @@
   webgli/configfiles:
   	check for key in etc_files['rc.conf'] to fix key error
   webgli/timezone: small fix.
+  webgli/extrapackages: list-type fix
+  webgli/services: same
+  glimd: add/edit_client updates.
   
   12 Jan 2006; Preston Cody <codeman@gentoo.org>
   added configure.pyhtml to glimd. minor changes
diff --git a/src/installer/src/net/server/html/add_client.pyhtml b/src/installer/src/net/server/html/add_client.pyhtml
index 8ff3d8ec79..0474ea3bc2 100644
--- a/src/installer/src/net/server/html/add_client.pyhtml
+++ b/src/installer/src/net/server/html/add_client.pyhtml
@@ -48,14 +48,14 @@ Note, all clients will first start with the start_install flag unset.  You must
 step to deploy all installations.
 <form action="/add_client.pyhtml" method="POST" enctype="multipart/form-data">
 Hostname: <input type="text" name="hostname"><br>
-MAC Address: <input type="text" name="mac" max_length="18"><br>
-Current IP: <input type="text" name="current_ip" max_length="15"> --- or <input type="checkbox" name="current_dhcp"> DHCP --- or <input type="checkbox" name="current_netup"> None (client is already up and connected to the net)<br>
+MAC Address: <input type="text" name="mac" maxlength="18"><br>
+Current IP: <input type="text" name="current_ip" maxlength="15"> --- or <input type="checkbox" name="current_dhcp"> DHCP --- or <input type="checkbox" name="current_netup"> None (client is already up and connected to the net)<br>
 Profile to be used by this client: <select name="profile">
 <: for profile in shared_info.profiles:
 <option value="<% profile['name'] %>"><% profile['name'] %></option>
 </select><br><hr>
 Post-install settings:
-Post-install network IP: <input type="text" name="post_ip" max_length="15"> 
+Post-install network IP: <input type="text" name="post_ip" maxlength="15"> 
 blah blah netmask gateway blah.
 --- or <input type="checkbox" name="post_dhcp"> DHCP.
 
diff --git a/src/installer/src/net/server/html/edit_client.pyhtml b/src/installer/src/net/server/html/edit_client.pyhtml
index 7b2fc8ea42..53c24a5191 100644
--- a/src/installer/src/net/server/html/edit_client.pyhtml
+++ b/src/installer/src/net/server/html/edit_client.pyhtml
@@ -39,4 +39,21 @@ if client['mac'] in shared_info.client_state:
 </table>
 <br><input type="submit" name="EditSubmit" value="Edit">
 </form>
+<? #EDIT THE CLIENT HERE ?>
+<form action="#" method="POST" enctype="multipart/form-data">
+Hostname: <input type="text" name="hostname" value="<% client_info[0] %>"><br>
+MAC Address: <input type="text" name="mac" maxlength="17" value="<% client_info[1] %>"><br>
+Current IP: <input type="text" name="current_ip" maxlength="15" value="<% client_info[2] %>"> --- or <input type="checkbox" name="current_dhcp" <? if client_info[2] == "dhcp": print "checked" ?>> DHCP --- or <input type="checkbox" name="current_netup" <? if client_info[2] == "None": print "checked" ?>> None (client is already up and connected to the net)<br>
+Profile to be used by this client: <select name="profile">
+<: for profile in shared_info.profiles:
+<option value="<% profile['name'] %>" <? if client_info[4] == profile['name']: print "selected" ?>><% profile['name'] %></option>
+</select><br><hr>
+Post-install settings:
+Post-install network IP: <input type="text" name="post_ip" maxlength="15" value="<% client_info[3] %>"> 
+blah blah netmask gateway blah.
+--- or <input type="checkbox" name="post_dhcp"> DHCP.
+
+<input type="submit" name="editclient" value="Save Changes">
+
+</form>
 <? include /main_bottom.pyhtml ?>
diff --git a/src/installer/src/net/server/html/webgli/extrapackages.pyhtml b/src/installer/src/net/server/html/webgli/extrapackages.pyhtml
index d09b3dbaac..8146ed54b4 100644
--- a/src/installer/src/net/server/html/webgli/extrapackages.pyhtml
+++ b/src/installer/src/net/server/html/webgli/extrapackages.pyhtml
@@ -4,7 +4,8 @@ error_msg = ""
 if post_params:
 	if post_params['packages']:
 		try:
-			packages = " ".join(post_params['packages'])
+			if isinstance(post_params['packages'], list):
+				packages = " ".join(post_params['packages'])
 			if packages:
 				shared_info.install_profile.set_install_packages(None, packages, None)
 		except:
diff --git a/src/installer/src/net/server/html/webgli/services.pyhtml b/src/installer/src/net/server/html/webgli/services.pyhtml
index 441cb7ea62..e01e3ff698 100644
--- a/src/installer/src/net/server/html/webgli/services.pyhtml
+++ b/src/installer/src/net/server/html/webgli/services.pyhtml
@@ -7,7 +7,8 @@ if post_params:
 			services = post_params['servicesmanual']				
 		elif post_params['services']:
 			services = post_params['services']
-			services = ",".join(services)
+			if isinstance(services, list):
+				services = ",".join(services)
 		try:
 			if services:
 				shared_info.install_profile.set_services(None, services, None)