BIO: Simplify the spaghetti code.

diff --git a/webapp/backend/netboot.py b/webapp/backend/netboot.py
index 190ba2709cf1abeb62b9b28e9731b4e37c38d634..eabd4dc8370407a60f404d83ceccfa5fbc5c93d1 100644 (file)
--- a/webapp/backend/netboot.py
+++ b/webapp/backend/netboot.py
@@ -52,11 +52,6 @@ class NetBoot(object):
                        if m.type == "header":
                                m.submenu = self.get_menu(m.submenu_level)
 
-                       elif m.type == "config":
-                               c = self.db.get("SELECT * FROM boot WHERE id = %s", m.item)
-                               if c:
-                                       m._data.update(c)
-
                        menu.append(m)
 
                return menu

diff --git a/webapp/handlers_boot.py b/webapp/handlers_boot.py
index f56afb888f54b7270c4d29c5f1e54c3a46f2373e..c1c4aed1491fe943d3cedf8cea6e14f562bc319d 100644 (file)
--- a/webapp/handlers_boot.py
+++ b/webapp/handlers_boot.py
@@ -104,16 +104,15 @@ class MenuCfgHandler(BootBaseHandler):
                        lines.append(ident + "menu end")
 
                elif entry.type == "config":
-                       lines.append(ident + "label %d" % entry.id)
-                       lines.append(ident + "\tmenu label %s" % entry.title)
-                       if entry.description:
+                       config = self.netboot.get_config(entry.item)
+
+                       lines.append(ident + "label %d" % config.id)
+                       lines.append(ident + "\tmenu label %s" % config.title)
+                       if config.description:
                                lines.append(ident + "\ttext help")
-                               lines.append(word_wrap(entry.description))
+                               lines.append(word_wrap(config.description))
                                lines.append(ident + "\tendtext")
 
-                       config = self.netboot.get_config(entry.item)
-                       if not config: return ""
-
                        lines.append(ident + "\tkernel %s" % config.image1)
                        if config.image2:
                                lines.append(ident + "\tinitrd %s" % config.image2)