Fix image type editing in the webapp

Conflicts:

	CHANGELOG

3 files changed, 5 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 07247dba..93d239ae 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -54,6 +54,7 @@ Patches and other contributions from:
     Scott Seago <sseago@redhat.com>
     Justin Sherill <jsherril@redhat.com>
     Anderson Silva <ansilva@redhat.com>
+    Dylan Swift <dylan.swift@gmail.com>
     Al Tobey <tobert@gmail.com>
     Thomas Uhde <thomas.uhde@KabelDeutschland.de>
     Ronald van den Blink <ronald@a61.nl>
diff --git a/CHANGELOG b/CHANGELOG
index 0bf7e3dc..61ca488a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,11 @@ Cobbler CHANGELOG
 - (BUGF) fix typo in network template (DNS enumeration)
 - (BUGF) make buildiso work for systems that are using bonding
 - (BUGF) blending fix for --template-files
+<<<<<<< HEAD:CHANGELOG
 - (BUGF) cobbler check ignores comments in TFTP config
+=======
+- (BUGF) fix image type field editing in the webapp
+>>>>>>> a1b9274... Fix image type editing in the webapp:CHANGELOG
 
 - Fri Jan 09 2009 - 1.4.1
 - (BUGF) Cobbler check looks for right httpd on SUSE
diff --git a/webui_templates/image_edit.tmpl b/webui_templates/image_edit.tmpl
index f4e95884..93bee828 100644
--- a/webui_templates/image_edit.tmpl
+++ b/webui_templates/image_edit.tmpl
@@ -336,8 +336,6 @@ function disablename(value)
           <option value="$it"
                #if $image and $image.image_type == $it
                     selected="1"  
-               #else if $it == "iso"
-                    selected="1"
                #end if
           >$it</option>
     #end for