Changeset 65041 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemchangelog.py

Timestamp:

Dec 31, 2016 3:03:28 AM (8 years ago)

Author:

vboxsync

Message:

testmanager: Tweaking the new changlog.

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemchangelog.py (modified) (5 diffs)

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

@@ -267 +267 @@
 
         elif oEntry.sEvent == SystemLogData.ksEvent_TestSetAbandoned:
-            sEvent = 'Abandoned test set';
+            sEvent = 'Abandoned ' if oEntry.sDesc.startswith('idTestSet') else 'Abandoned test set';
             oDetails = self._formatDescGeneric(oEntry.sDesc, oEntry);
 
@@ -359 +359 @@
             oChangeEntry    = aoChanges[0];
             cAttribsChanged = len(oChangeEntry.aoChanges) + 1;
+            if oChangeEntry.oOldRaw is None and sEvent.startswith('Modified '):
+                sEvent = 'Created ' + sEvent[9:];
+
         else:
             oChangeEntry    = None;
@@ -366 +369 @@
                 u'    <td rowspan="%d">%s</td>\n' \
                 u'    <td rowspan="%d">%s</td>\n' \
-                u'    <td rowspan="%d">%s</td>\n' \
-                u'    <td colspan="3">%s</td>\n' \
+                u'    <td rowspanx="%d" colspan="4">%s<!--</td>\n' \
+                u'    <td colspan="3">--> %s</td>\n' \
                 u'  </tr>\n' \
               % ( sRowClass,
@@ -378 +381 @@
         if oChangeEntry is not None:
             for j, oChange in enumerate(oChangeEntry.aoChanges):
+                sHtml += '        <tr class="%s%s tmsyschlogattr"><td class="%s tmsyschlogspacer%s"></td>' \
+                       % ( sRowClass, 'odd' if j & 1 else 'even',
+                           sRowClass, 'final' if j + 1 == len(oChangeEntry.aoChanges) else '');
                 if isinstance(oChange, AttributeChangeEntryPre):
-                    sHtml += '        <tr class="%s%s tmsyschlogattr"><td>%s</td>'\
-                             '<td><div class="tdpre"><pre>%s</pre></div></td>' \
+                    sHtml += '<td><div class="tdpre"><pre>%s</pre></div></td>' \
                              '<td><div class="tdpre"><pre>%s</pre></div></td></tr>\n' \
-                           % ( sRowClass, 'odd' if j & 1 else 'even',
-                               webutils.escapeElem(oChange.sAttr),
+                           % ( webutils.escapeElem(oChange.sAttr),
                                webutils.escapeElem(oChange.sOldText),
                                webutils.escapeElem(oChange.sNewText), );
                 else:
-                    sHtml += '        <tr class="%s%s tmsyschlogattr"><td>%s</td><td>%s</td><td>%s</td></tr>\n' \
-                           % ( sRowClass, 'odd' if j & 1 else 'even',
-                               webutils.escapeElem(oChange.sAttr),
+                    sHtml += '        <td>%s</td><td>%s</td><td>%s</td></tr>\n' \
+                           % ( webutils.escapeElem(oChange.sAttr),
                                webutils.escapeElem(oChange.sOldText),
                                webutils.escapeElem(oChange.sNewText), );
@@ -405 +408 @@
                 u'  <th rowspan="2">When</th>\n' \
                 u'  <th rowspan="2">Who</th>\n' \
-                u'  <th rowspan="2">Event</th>\n' \
-                u'  <th colspan="3">Details</th>\n' \
+                u'  <th colspan="4">Event</th>\n' \
                 u' </tr>\n' \
                 u' <tr>\n' \
+                u'  <th></th>\n' \
                 u'  <th>Attribute</th>\n' \
-                u'  <th>Old Value</th>\n' \
-                u'  <th>New Value</th>\n' \
+                u'  <th>Old</th>\n' \
+                u'  <th>New</th>\n' \
                 u' </tr>\n' \
                 u'</thead>\n';