Changeset 83391 in vbox for trunk

Timestamp:

Mar 24, 2020 4:59:31 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/changelogs: Made the tsEffective value a link (typically works).

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuibase.py (modified) (1 diff)
• wuicontentbase.py (modified) (4 diffs)

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

@@ -356 +356 @@
     #
 
+    def getUrlNoParams(self):
+        """
+        Returns the base URL without any parameters (no trailing '?' or &).
+        """
+        return self._sUrlBase[:self._sUrlBase.rindex('?')];
+
+    def getUrlBase(self):
+        """
+        Returns the base URL, ending with '?' or '&'.
+        This may already include some debug parameters.
+        """
+        return self._sUrlBase;
+
     def getParameters(self):
         """

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

@@ -485 +485 @@
 
     @staticmethod
-    def formatChangeLogEntry(aoEntries, iEntry):
+    def formatChangeLogEntry(aoEntries, iEntry, sUrl, dParams):
         """
         Formats one change log entry into one or more HTML table rows.
+
+        The sUrl and dParams arguments are used to construct links to historical
+        data using the tsEffective value.  If no links wanted, they'll both be None.
 
         Note! The parameters are given as array + index in case someone wishes
@@ -494 +497 @@
         """
         oEntry = aoEntries[iEntry];
+
+        # Turn the effective date into a URL if we can:
+        if sUrl:
+            dParams[WuiDispatcherBase.ksParamEffectiveDate] = oEntry.tsEffective;
+            sEffective = WuiLinkBase(WuiFormContentBase.formatTsShort(oEntry.tsEffective), sUrl,
+                                     dParams, fBracketed = False).toHtml();
+        else:
+            sEffective = webutils.escapeElem(WuiFormContentBase.formatTsShort(oEntry.tsEffective))
 
         # The primary row.
@@ -503 +514 @@
                    '    </tr>\n' \
                  % ( sRowClass,
-                     len(oEntry.aoChanges) + 1, webutils.escapeElem(WuiFormContentBase.formatTsShort(oEntry.tsEffective)),
+                     len(oEntry.aoChanges) + 1, sEffective,
                      len(oEntry.aoChanges) + 1, webutils.escapeElem(WuiFormContentBase.formatTsShort(oEntry.tsExpire)),
                      WuiFormContentBase._guessChangeLogEntryDescription(aoEntries, iEntry),
@@ -624 +635 @@
                     '    <tbody>\n';
 
+        if self._sMode == self.ksMode_Show:
+            sUrl    = self._oDisp.getUrlNoParams();
+            dParams = self._oDisp.getParameters();
+        else:
+            sUrl    = None;
+            dParams = None;
+
         for iEntry, _ in enumerate(aoEntries):
-            sContent += self.formatChangeLogEntry(aoEntries, iEntry);
+            sContent += self.formatChangeLogEntry(aoEntries, iEntry, sUrl, dParams);
 
         sContent += '    <tbody>\n' \