Changeset 65086 in vbox for trunk/src

Timestamp:

Jan 3, 2017 8:08:16 PM (8 years ago)

Author:

vboxsync

Message:

Testmanager/wuibase.py: three bug fixes

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py

@@ -211 +211 @@
                                     + webutils.escapeElem(asSubItem[0]) + '</a></li>\n';
                 else:
-                    sSideMenuItems += '<li class="subheader_item">' + webutils.escapeElem(asSubItem[0]) + '</a></li>';
+                    sSideMenuItems += '<li class="subheader_item">' + webutils.escapeElem(asSubItem[0]) + '</li>';
         return (sTopMenuItems, sSideMenuItems);
 
@@ -295 +295 @@
                 self._sDebug += self._debugRenderPanel();
         if self._sDebug != '':
-            dReplacements['@@DEBUG@@'] = '<div id="debug"><br><br><hr/>' + \
-                unicode(self._sDebug, errors='ignore') if isinstance(self._sDebug, str) else self._sDebug + '</div>';
+            dReplacements['@@DEBUG@@'] = u'<div id="debug"><br><br><hr/>' \
+                                       + (unicode(self._sDebug, errors='ignore') if isinstance(self._sDebug, str)
+                                          else self._sDebug) \
+                                       + u'</div>\n';
 
         #
@@ -335 +337 @@
 
         # The final chunk.
-        if offStart < offCur:
+        if offStart < len(sTmpl):
             self._oSrvGlue.write(sTmpl[offStart:]);
 
@@ -764 +766 @@
                 [self.ksParamDbgSqlTrace, self._fDbgSqlTrace, 'SQL trace'],
                 [self.ksParamDbgSqlExplain, self._fDbgSqlExplain, 'SQL explain'], ):
-            sHtml += ' <input type="checkbox" name="%s" value="1"%s>%s</input>\n' \
+            sHtml += ' <input type="checkbox" name="%s" value="1"%s />%s\n' \
                 % (aoCheckBox[0], ' checked' if aoCheckBox[1] else '', aoCheckBox[2]);